X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=progsvm.h;h=edad32a5c92270889432b4ea0e92452c45794243;hb=9deeeb6b94762dbf7e9156b098bb164f91aa0184;hp=9c907feddcf7aa287cd0ec8d05ea113b3a5af244;hpb=eac136f938e6f6fb67832619c79ca3769e0b51c1;p=xonotic%2Fdarkplaces.git

diff --git a/progsvm.h b/progsvm.h
index 9c907fed..edad32a5 100644
--- a/progsvm.h
+++ b/progsvm.h
@@ -33,10 +33,8 @@ The code uses void pointers instead.
 #include "progdefs.h"			// generated by program cdefs
 #include "clprogdefs.h"			// generated by program cdefs
 
-#ifdef SUPPORT_GECKO
 // forward declaration of clgecko_t
 struct clgecko_s;
-#endif
 
 typedef struct prvm_stack_s
 {
@@ -69,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
@@ -119,9 +119,7 @@ typedef struct prvm_edict_s
 
 #define PRVM_MAX_OPENFILES 256
 #define PRVM_MAX_OPENSEARCHES 128
-#ifdef SUPPORT_GECKO
 #define PRVM_MAX_GECKOINSTANCES 32
-#endif
 
 typedef void (*prvm_builtin_t) (void);
 
@@ -130,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
@@ -196,8 +195,9 @@ typedef struct prvm_prog_fieldoffsets_s
 	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
@@ -217,6 +217,8 @@ typedef struct prvm_prog_fieldoffsets_s
 	int viewmodelforclient; // ssqc
 	int viewzoom; // ssqc
 	int yaw_speed; // ssqc / csqc
+	int clientcamera; // ssqc
+	int clientstatus; // ssqc
 }
 prvm_prog_fieldoffsets_t;
 
@@ -240,6 +242,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
@@ -252,6 +255,11 @@ 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
 }
 prvm_prog_globaloffsets_t;
 
@@ -261,6 +269,7 @@ typedef struct prvm_prog_funcoffsets_s
 {
 	func_t CSQC_ConsoleCommand; // csqc
 	func_t CSQC_Ent_Remove; // csqc
+	func_t CSQC_Ent_Spawn; // csqc DP_CSQC_ENT_SPAWN extension (BlackHC - TODO: needs to be added to dpextensions.qc)
 	func_t CSQC_Ent_Update; // csqc
 	func_t CSQC_Event; // csqc [515]: engine call this for its own needs so csqc can do some things according to what engine it's running on.  example: to say about edicts increase, whatever...
 	func_t CSQC_Event_Sound; // csqc : called by engine when an incoming sound packet arrives so CSQC can act on it
@@ -272,13 +281,18 @@ typedef struct prvm_prog_funcoffsets_s
 	func_t CSQC_Parse_TempEntity; // csqc [515]: very helpfull when you want to create your own particles/decals/etc for effects that already exist
 	func_t CSQC_Shutdown; // csqc
 	func_t CSQC_UpdateView; // csqc
+	func_t Gecko_Query; // csqc, mqc
 	func_t EndFrame; // ssqc
 	func_t RestoreGame; // ssqc
 	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
 
 	// menu qc only uses some functions, nothing else
 	func_t m_draw; // mqc
@@ -290,6 +304,15 @@ typedef struct prvm_prog_funcoffsets_s
 }
 prvm_prog_funcoffsets_t;
 
+typedef struct prvm_stringbuffer_s
+{
+	int max_strings;
+	int num_strings;
+	char **strings;
+	const char *origin;
+}
+prvm_stringbuffer_t;
+
 // [INIT] variables flagged with this token can be initialized by 'you'
 // NOTE: external code has to create and free the mempools but everything else is done by prvm !
 typedef struct prvm_prog_s
@@ -322,8 +345,11 @@ typedef struct prvm_prog_s
 	int					firstfreeknownstring;
 	const char			**knownstrings;
 	unsigned char		*knownstrings_freeable;
+	const char          **knownstrings_origin;
 	const char			***stringshash;
 
+	memexpandablearray_t	stringbuffersarray;
+
 	// all memory allocations related to this vm_prog (code, edicts, strings)
 	mempool_t			*progs_mempool; // [INIT]
 
@@ -345,6 +371,7 @@ typedef struct prvm_prog_s
 	int					localstack_used;
 
 	unsigned short		headercrc; // [INIT]
+	unsigned short		headercrc2; // [INIT] alternate CRC for tenebrae progs.dat
 
 	unsigned short		filecrc;
 
@@ -352,10 +379,10 @@ 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];
-#ifdef SUPPORT_GECKO
+	const char *         opensearches_origin[PRVM_MAX_OPENSEARCHES];
 	struct clgecko_s		*opengeckoinstances[PRVM_MAX_GECKOINSTANCES];
-#endif
 
 	// copies of some vars that were former read from sv
 	int					num_edicts;
@@ -394,6 +421,7 @@ typedef struct prvm_prog_s
 
 	// used to indicate whether a prog is loaded
 	qboolean			loaded;
+	qboolean			leaktest_active;
 
 //	prvm_builtin_mem_t  *mem_list;
 
@@ -480,6 +508,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);
@@ -507,8 +537,9 @@ void PRVM_ED_ParseGlobals (const char *data);
 
 void PRVM_ED_LoadFromFile (const char *data);
 
-prvm_edict_t *PRVM_EDICT_NUM_ERROR(int n, char *filename, int fileline);
-#define	PRVM_EDICT_NUM(n) (((unsigned)(n) < (unsigned int)prog->max_edicts) ? prog->edicts + (n) : PRVM_EDICT_NUM_ERROR(n, __FILE__, __LINE__))
+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))