X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=progsvm.h;h=9ec87682397ec7c1630b375ef0f96c54a463d7fc;hb=aa2d8a45047185f5501e62b75b7839cc2bff2bb0;hp=cb467595a70d12d92a179a941e3e1ec8495b267d;hpb=71de4dd795b4049a7b77a20186820a86a776319d;p=xonotic%2Fdarkplaces.git

diff --git a/progsvm.h b/progsvm.h
index cb467595..9ec87682 100644
--- a/progsvm.h
+++ b/progsvm.h
@@ -162,6 +162,7 @@ typedef struct prvm_prog_fieldoffsets_s
 	int customizeentityforclient; // ssqc
 	int dimension_hit; // ssqc / csqc
 	int dimension_solid; // ssqc / csqc
+	int disableclientprediction; // ssqc
 	int dphitcontentsmask; // ssqc / csqc
 	int drawonlytoclient; // ssqc
 	int effects; // ssqc / csqc
@@ -184,8 +185,11 @@ typedef struct prvm_prog_fieldoffsets_s
 	int items2; // ssqc
 	int lerpfrac; // csqc
 	int light_lev; // ssqc
+	int message; // csqc
+	int modelflags; // ssqc
 	int movement; // ssqc
 	int nextthink; // common - used by OP_STATE
+	int netaddress; // ssqc
 	int nodrawtoclient; // ssqc
 	int pflags; // ssqc
 	int ping; // ssqc
@@ -218,6 +222,7 @@ typedef struct prvm_prog_globaloffsets_s
 	int v_forward; // ssqc / csqc
 	int v_right; // ssqc / csqc
 	int v_up; // ssqc / csqc
+	int view_angles; // csqc
 	int trace_allsolid; // ssqc / csqc
 	int trace_startsolid; // ssqc / csqc
 	int trace_fraction; // ssqc / csqc
@@ -231,6 +236,14 @@ typedef struct prvm_prog_globaloffsets_s
 	int trace_dphitq3surfaceflags; // ssqc / csqc
 	int trace_dphittexturename; // ssqc / csqc
 	int trace_dpstartcontents; // ssqc / csqc
+	int intermission; // csqc
+	int coop; // csqc
+	int deathmatch; // csqc
+	int dmg_take; // csqc
+	int dmg_save; // csqc
+	int dmg_origin; // csqc
+	int sb_showscores; // csqc
+	int drawfont; // csqc / menu
 }
 prvm_prog_globaloffsets_t;
 
@@ -242,6 +255,7 @@ typedef struct prvm_prog_funcoffsets_s
 	func_t CSQC_Ent_Remove; // csqc
 	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
 	func_t CSQC_Init; // csqc
 	func_t CSQC_InputEvent; // csqc
 	func_t CSQC_Parse_CenterPrint; // csqc
@@ -255,11 +269,11 @@ typedef struct prvm_prog_funcoffsets_s
 	func_t SV_ChangeTeam; // ssqc
 	func_t SV_ParseClientCommand; // ssqc
 	func_t SV_PlayerPhysics; // ssqc
+	func_t SV_OnEntityNoSpawnFunction; // ssqc
+	func_t GameCommand; // any
 
 	// menu qc only uses some functions, nothing else
-	func_t m_display; // mqc
 	func_t m_draw; // mqc
-	func_t m_hide; // mqc
 	func_t m_init; // mqc
 	func_t m_keydown; // mqc
 	func_t m_keyup; // mqc
@@ -272,6 +286,7 @@ prvm_prog_funcoffsets_t;
 // NOTE: external code has to create and free the mempools but everything else is done by prvm !
 typedef struct prvm_prog_s
 {
+	double              starttime;
 	dprograms_t			*progs;
 	mfunction_t			*functions;
 	char				*strings;
@@ -298,7 +313,7 @@ typedef struct prvm_prog_s
 	// (simple optimization of the free string search)
 	int					firstfreeknownstring;
 	const char			**knownstrings;
-	unsigned char				*knownstrings_freeable;
+	unsigned char		*knownstrings_freeable;
 	const char			***stringshash;
 
 	// all memory allocations related to this vm_prog (code, edicts, strings)
@@ -342,8 +357,8 @@ typedef struct prvm_prog_s
 	int					reserved_edicts; // [INIT]
 
 	prvm_edict_t		*edicts;
-	void				*edictsfields;
-	void				*edictprivate;
+	void					*edictsfields;
+	void					*edictprivate;
 
 	// size of the engine private struct
 	int					edictprivate_size; // [INIT]
@@ -360,7 +375,7 @@ typedef struct prvm_prog_s
 	char				*name; // [INIT]
 
 	// flag - used to store general flags like PRVM_GE_SELF, etc.
-	int					flag;
+	int				flag;
 
 	char				*extensionstring; // [INIT]
 
@@ -448,6 +463,7 @@ void _PRVM_FreeAll (const char *filename, int fileline);
 
 void PRVM_Profile (int maxfunctions, int mininstructions);
 void PRVM_Profile_f (void);
+void PRVM_CallProfile_f (void);
 void PRVM_PrintFunction_f (void);
 
 void PRVM_PrintState(void);
@@ -471,7 +487,7 @@ void PRVM_ED_Free (prvm_edict_t *ed);
 void PRVM_ED_ClearEdict (prvm_edict_t *e);
 
 void PRVM_PrintFunctionStatements (const char *name);
-void PRVM_ED_Print(prvm_edict_t *ed);
+void PRVM_ED_Print(prvm_edict_t *ed, const char *wildcard_fieldname);
 void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed);
 const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent);
 
@@ -481,8 +497,7 @@ 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) (((n) >= 0 && (n) < prog->max_edicts) ? prog->edicts + (n) : PRVM_EDICT_NUM_ERROR(n, __FILE__, __LINE__))
-#define	PRVM_EDICT_NUM_UNSIGNED(n) (((n) < prog->max_edicts) ? prog->edicts + (n) : PRVM_EDICT_NUM_ERROR(n, __FILE__, __LINE__))
+#define	PRVM_EDICT_NUM(n) (((unsigned)(n) < (unsigned int)prog->max_edicts) ? prog->edicts + (n) : PRVM_EDICT_NUM_ERROR(n, __FILE__, __LINE__))
 
 //int NUM_FOR_EDICT_ERROR(prvm_edict_t *e);
 #define PRVM_NUM_FOR_EDICT(e) ((int)((prvm_edict_t *)(e) - prog->edicts))
@@ -517,7 +532,7 @@ extern	int		prvm_type_size[8]; // for consistency : I think a goal of this sub-p
 void PRVM_Init_Exec(void);
 
 void PRVM_ED_PrintEdicts_f (void);
-void PRVM_ED_PrintNum (int ent);
+void PRVM_ED_PrintNum (int ent, const char *wildcard_fieldname);
 
 const char *PRVM_GetString(int num);
 int PRVM_SetEngineString(const char *s);