X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=progsvm.h;h=3d9af47730cd0bd79a1576bd97ed4399ff3aaf37;hb=f3bcb973304c8d33eb7b4618ae2109f74d8f6753;hp=e46eed01171f7e7cdef6965a6b61c6aca10af917;hpb=17c4cc7228e9fc5f7c6cd60f12470668fea71646;p=xonotic%2Fdarkplaces.git diff --git a/progsvm.h b/progsvm.h index e46eed01..3d9af477 100644 --- a/progsvm.h +++ b/progsvm.h @@ -67,6 +67,8 @@ typedef struct prvm_edict_private_s { qboolean free; float freetime; + int mark; + const char *allocation_origin; } prvm_edict_private_t; typedef struct prvm_edict_s @@ -126,7 +128,8 @@ typedef struct prvm_prog_fieldoffsets_s { // server and client use a lot of similar fields, so this is combined int SendEntity; // ssqc - int Version; // ssqc + int SendFlags; // ssqc + int Version; // ssqc (legacy) int alpha; // ssqc / csqc int ammo_cells1; // ssqc - Dissolution of Eternity mission pack int ammo_lava_nails; // ssqc - Dissolution of Eternity mission pack @@ -154,7 +157,9 @@ typedef struct prvm_prog_fieldoffsets_s int buttonuse; // ssqc int chain; // common - used by find builtins int classname; // common + int clientcamera; // ssqc int clientcolors; // ssqc + int clientstatus; // ssqc int color; // ssqc int colormod; // ssqc / csqc int contentstransition; // ssqc @@ -176,6 +181,10 @@ typedef struct prvm_prog_fieldoffsets_s int frame1time; // csqc int frame2; // csqc int frame2time; // csqc + int frame3; // csqc + int frame3time; // csqc + int frame4; // csqc + int frame4time; // csqc int frame; // common - used by OP_STATE int fullbright; // ssqc - Nehahra support int glow_color; // ssqc @@ -187,13 +196,16 @@ typedef struct prvm_prog_fieldoffsets_s int ideal_yaw; // ssqc / csqc int idealpitch; // ssqc / csqc int items2; // ssqc + int lerpfrac3; // csqc + int lerpfrac4; // csqc int lerpfrac; // csqc int light_lev; // ssqc int message; // csqc int modelflags; // ssqc int movement; // ssqc - int nextthink; // common - used by OP_STATE + int movetypesteplandevent; // ssqc int netaddress; // ssqc + int nextthink; // common - used by OP_STATE int nodrawtoclient; // ssqc int pflags; // ssqc int ping; // ssqc @@ -206,6 +218,7 @@ typedef struct prvm_prog_fieldoffsets_s int renderflags; // csqc int rendermode; // ssqc - HalfLife support int scale; // ssqc / csqc + int shadertime; // csqc int style; // ssqc int tag_entity; // ssqc / csqc int tag_index; // ssqc / csqc @@ -213,7 +226,6 @@ typedef struct prvm_prog_fieldoffsets_s int viewmodelforclient; // ssqc int viewzoom; // ssqc int yaw_speed; // ssqc / csqc - int clientcamera; // ssqc } prvm_prog_fieldoffsets_t; @@ -237,6 +249,7 @@ typedef struct prvm_prog_globaloffsets_s int trace_plane_normal; // ssqc / csqc int trace_plane_dist; // ssqc / csqc int trace_ent; // ssqc / csqc + int trace_networkentity; // csqc int trace_dphitcontents; // ssqc / csqc int trace_dphitq3surfaceflags; // ssqc / csqc int trace_dphittexturename; // ssqc / csqc @@ -249,6 +262,17 @@ typedef struct prvm_prog_globaloffsets_s int dmg_origin; // csqc int sb_showscores; // csqc int drawfont; // csqc / menu + int require_spawnfunc_prefix; // ssqc + int worldstatus; // ssqc + int servertime; // csqc + int serverprevtime; // csqc + int serverdeltatime; // csqc + int gettaginfo_name; // ssqc / csqc + int gettaginfo_parent; // ssqc / csqc + int gettaginfo_offset; // ssqc / csqc + int gettaginfo_forward; // ssqc / csqc + int gettaginfo_right; // ssqc / csqc + int gettaginfo_up; // ssqc / csqc } prvm_prog_globaloffsets_t; @@ -276,9 +300,13 @@ typedef struct prvm_prog_funcoffsets_s func_t SV_ChangeTeam; // ssqc func_t SV_ParseClientCommand; // ssqc func_t SV_PlayerPhysics; // ssqc + func_t SV_OnEntityPreSpawnFunction; // ssqc func_t SV_OnEntityNoSpawnFunction; // ssqc + func_t SV_OnEntityPostSpawnFunction; // ssqc func_t GameCommand; // any func_t SV_Shutdown; // ssqc + func_t URI_Get_Callback; // any + func_t SV_PausedTic; //ssqc // menu qc only uses some functions, nothing else func_t m_draw; // mqc @@ -295,6 +323,7 @@ typedef struct prvm_stringbuffer_s int max_strings; int num_strings; char **strings; + const char *origin; } prvm_stringbuffer_t; @@ -330,6 +359,7 @@ typedef struct prvm_prog_s int firstfreeknownstring; const char **knownstrings; unsigned char *knownstrings_freeable; + const char **knownstrings_origin; const char ***stringshash; memexpandablearray_t stringbuffersarray; @@ -363,7 +393,9 @@ typedef struct prvm_prog_s // until this point everything also exists (with the pr_ prefix) in the old vm qfile_t *openfiles[PRVM_MAX_OPENFILES]; + const char * openfiles_origin[PRVM_MAX_OPENFILES]; fssearch_t *opensearches[PRVM_MAX_OPENSEARCHES]; + const char * opensearches_origin[PRVM_MAX_OPENSEARCHES]; struct clgecko_s *opengeckoinstances[PRVM_MAX_GECKOINSTANCES]; // copies of some vars that were former read from sv @@ -403,6 +435,10 @@ typedef struct prvm_prog_s // used to indicate whether a prog is loaded qboolean loaded; + qboolean leaktest_active; + + // printed together with backtraces + const char *statestring; // prvm_builtin_mem_t *mem_list; @@ -431,7 +467,6 @@ typedef struct prvm_prog_s void (*reset_cmd)(void); // [INIT] used by PRVM_ResetProg void (*error_cmd)(const char *format, ...) DP_FUNC_PRINTF(1); // [INIT] - } prvm_prog_t; extern prvm_prog_t * prog; @@ -489,6 +524,8 @@ void PRVM_PrintFunction_f (void); void PRVM_PrintState(void); void PRVM_CrashAll (void); void PRVM_Crash (void); +void PRVM_ShortStackTrace(char *buf, size_t bufsize); +const char *PRVM_AllocationOrigin(); ddef_t *PRVM_ED_FindField(const char *name); ddef_t *PRVM_ED_FindGlobal(const char *name); @@ -516,9 +553,9 @@ void PRVM_ED_ParseGlobals (const char *data); void PRVM_ED_LoadFromFile (const char *data); -prvm_edict_t *PRVM_EDICT_NUM_ERROR(unsigned int n, char *filename, int fileline); -#define PRVM_CHECKEDICTNUM(n) (((unsigned)(n) < (unsigned int)prog->max_edicts) ? NULL : PRVM_EDICT_NUM_ERROR((n), __FILE__, __LINE__)) -#define PRVM_EDICT_NUM(n) (PRVM_CHECKEDICTNUM(n), prog->edicts + (n)) +unsigned int PRVM_EDICT_NUM_ERROR(unsigned int n, char *filename, int fileline); +#define PRVM_EDICT(n) (((unsigned)(n) < (unsigned int)prog->max_edicts) ? (unsigned int)(n) : PRVM_EDICT_NUM_ERROR((unsigned int)(n), __FILE__, __LINE__)) +#define PRVM_EDICT_NUM(n) (prog->edicts + PRVM_EDICT(n)) //int NUM_FOR_EDICT_ERROR(prvm_edict_t *e); #define PRVM_NUM_FOR_EDICT(e) ((int)((prvm_edict_t *)(e) - prog->edicts))