X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=progs.h;h=cdae2523cc26b9c59913ae88313c9a5777049c9c;hp=a50b7af9354c1ce754e728df94ad45a4771b9e5d;hb=c2d9e7bd4a51f885f0fa3119738b440652aa07e0;hpb=8d7975810323fb62e00a37e981a758978195545b

diff --git a/progs.h b/progs.h
index a50b7af9..cdae2523 100644
--- a/progs.h
+++ b/progs.h
@@ -30,33 +30,56 @@ typedef union eval_s
 	float			_float;
 	float			vector[3];
 	func_t			function;
+	int				ivector[3];
 	int				_int;
 	int				edict;
 } eval_t;
 
 typedef struct link_s
 {
+	int entitynumber;
 	struct link_s	*prev, *next;
 } link_t;
 
-// LordHavoc: increased number of leafs per entity limit from 16 to 256
-#define	MAX_ENT_LEAFS	256
+#define ENTITYGRIDAREAS 16
+
+typedef struct edict_engineprivate_s
+{
+	// true if this edict is unused
+	qboolean free;
+	// sv.time when the object was freed (to prevent early reuse which could
+	// mess up client interpolation or obscure severe QuakeC bugs)
+	float freetime;
+
+	// physics grid areas this edict is linked into
+	link_t areagrid[ENTITYGRIDAREAS];
+	// since the areagrid can have multiple references to one entity,
+	// we should avoid extensive checking on entities already encountered
+	int areagridmarknumber;
+
+	// PROTOCOL_QUAKE
+	// baseline values
+	entity_state_t baseline;
+
+	// LordHavoc: gross hack to make floating items still work
+	int suspendedinairflag;
+	// used by PushMove to keep track of where objects were before they were
+	// moved, in case they need to be moved back
+	vec3_t moved_from;
+	vec3_t moved_fromangles;
+}
+edict_engineprivate_t;
+
+// the entire server entity structure
+// NOTE: keep this small!  priv and v are dynamic but this struct is not!
 typedef struct edict_s
 {
-	qboolean free; // true if this edict is unused
-	link_t area; // physics area this edict is linked into
-	int number; // number of this edict
-
-#ifdef QUAKEENTITIES
-	entity_state_t baseline; // baseline values
-	entity_state_t deltabaseline; // LordHavoc: previous frame
-#endif
-
-	int suspendedinairflag; // LordHavoc: gross hack to make floating items still work
-	float freetime; // sv.time when the object was freed
-	entvars_t v; // C exported fields from progs
-// other fields from progs come immediately after
-} edict_t;
+	// engine-private fields (stored in dynamically resized array)
+	edict_engineprivate_t *e;
+	// QuakeC fields (stored in dynamically resized array)
+	entvars_t *v;
+}
+edict_t;
 
 // LordHavoc: in an effort to eliminate time wasted on GetEdictFieldValue...  see pr_edict.c for the functions which use these.
 extern int eval_gravity;
@@ -66,6 +89,8 @@ extern int eval_button5;
 extern int eval_button6;
 extern int eval_button7;
 extern int eval_button8;
+extern int eval_buttonuse;
+extern int eval_buttonchat;
 extern int eval_glow_size;
 extern int eval_glow_trail;
 extern int eval_glow_color;
@@ -93,17 +118,34 @@ extern int eval_movement;
 extern int eval_pmodel;
 extern int eval_punchvector;
 extern int eval_viewzoom;
-
-#define GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (eval_t*)((char*)&ed->v + fieldoffset) : NULL)
-
-
-extern dfunction_t *SV_PlayerPhysicsQC;
-extern dfunction_t *EndFrameQC;
+extern int eval_clientcolors;
+extern int eval_tag_entity;
+extern int eval_tag_index;
+extern int eval_light_lev;
+extern int eval_color;
+extern int eval_style;
+extern int eval_pflags;
+extern int eval_cursor_active;
+extern int eval_cursor_screen;
+extern int eval_cursor_trace_start;
+extern int eval_cursor_trace_endpos;
+extern int eval_cursor_trace_ent;
+extern int eval_colormod;
+extern int eval_playermodel;
+extern int eval_playerskin;
+
+#define GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (eval_t *)((qbyte *)ed->v + fieldoffset) : NULL)
+
+
+extern mfunction_t *SV_PlayerPhysicsQC;
+extern mfunction_t *EndFrameQC;
+//KrimZon - SERVER COMMANDS IN QUAKEC
+extern mfunction_t *SV_ParseClientCommandQC;
 
 //============================================================================
 
 extern	dprograms_t		*progs;
-extern	dfunction_t		*pr_functions;
+extern	mfunction_t		*pr_functions;
 extern	char			*pr_strings;
 extern	ddef_t			*pr_globaldefs;
 extern	ddef_t			*pr_fielddefs;
@@ -119,51 +161,61 @@ extern	int				pr_edictareasize; // LordHavoc: for bounds checking
 void PR_Init (void);
 
 void PR_ExecuteProgram (func_t fnum, const char *errormessage);
-void PR_LoadProgs (void);
+void PR_LoadProgs (const char *progsname);
 
 void PR_Profile_f (void);
 
+void PR_PrintState(void);
 void PR_Crash (void);
 
+void SV_IncreaseEdicts(void);
+
 edict_t *ED_Alloc (void);
 void ED_Free (edict_t *ed);
+void ED_ClearEdict (edict_t *e);
 
 char	*ED_NewString (const char *string);
 // returns a copy of the string allocated from the server's string heap
 
-void ED_Print (edict_t *ed);
-void ED_Write (QFile *f, edict_t *ed);
+void ED_Print(edict_t *ed);
+void ED_Write (qfile_t *f, edict_t *ed);
 const char *ED_ParseEdict (const char *data, edict_t *ent);
 
-void ED_WriteGlobals (QFile *f);
+void ED_WriteGlobals (qfile_t *f);
 void ED_ParseGlobals (const char *data);
 
 void ED_LoadFromFile (const char *data);
 
-edict_t *EDICT_NUM_ERROR(int n);
-#define EDICT_NUM(n) ((n >= 0 && n < sv.max_edicts) ? sv.edictstable[(n)] : EDICT_NUM_ERROR(n))
+edict_t *EDICT_NUM_ERROR(int n, char *filename, int fileline);
+#define EDICT_NUM(n) (((n) >= 0 && (n) < sv.max_edicts) ? sv.edicts + (n) : EDICT_NUM_ERROR(n, __FILE__, __LINE__))
+#define EDICT_NUM_UNSIGNED(n) (((n) < sv.max_edicts) ? sv.edicts + (n) : EDICT_NUM_ERROR(n, __FILE__, __LINE__))
 
-int NUM_FOR_EDICT(edict_t *e);
+//int NUM_FOR_EDICT_ERROR(edict_t *e);
+#define NUM_FOR_EDICT(e) ((int)((edict_t *)(e) - sv.edicts))
+//int NUM_FOR_EDICT(edict_t *e);
 
-#define	NEXT_EDICT(e) ((edict_t *)( (qbyte *)e + pr_edict_size))
+#define	NEXT_EDICT(e) ((e) + 1)
 
-#define	EDICT_TO_PROG(e) ((qbyte *)e - (qbyte *)sv.edicts)
-#define PROG_TO_EDICT(e) ((edict_t *)((qbyte *)sv.edicts + e))
+#define EDICT_TO_PROG(e) (NUM_FOR_EDICT(e))
+//int EDICT_TO_PROG(edict_t *e);
+#define PROG_TO_EDICT(n) (EDICT_NUM(n))
+//edict_t *PROG_TO_EDICT(int n);
 
 //============================================================================
 
 #define	G_FLOAT(o) (pr_globals[o])
 #define	G_INT(o) (*(int *)&pr_globals[o])
-#define	G_EDICT(o) ((edict_t *)((qbyte *)sv.edicts+ *(int *)&pr_globals[o]))
+#define	G_EDICT(o) (PROG_TO_EDICT(*(int *)&pr_globals[o]))
 #define G_EDICTNUM(o) NUM_FOR_EDICT(G_EDICT(o))
 #define	G_VECTOR(o) (&pr_globals[o])
-#define	G_STRING(o) (pr_strings + *(string_t *)&pr_globals[o])
-#define	G_FUNCTION(o) (*(func_t *)&pr_globals[o])
+#define	G_STRING(o) (PR_GetString(*(string_t *)&pr_globals[o]))
+//#define	G_FUNCTION(o) (*(func_t *)&pr_globals[o])
 
-#define	E_FLOAT(e,o) (((float*)&e->v)[o])
-#define	E_INT(e,o) (*(int *)&((float*)&e->v)[o])
-#define	E_VECTOR(e,o) (&((float*)&e->v)[o])
-#define	E_STRING(e,o) (pr_strings + *(string_t *)&((float*)&e->v)[o])
+// FIXME: make these go away?
+#define	E_FLOAT(e,o) (((float*)e->v)[o])
+//#define	E_INT(e,o) (((int*)e->v)[o])
+//#define	E_VECTOR(e,o) (&((float*)e->v)[o])
+#define	E_STRING(e,o) (PR_GetString(*(string_t *)&((float*)e->v)[o]))
 
 extern	int		type_size[8];
 
@@ -173,8 +225,8 @@ extern int pr_numbuiltins;
 
 extern int		pr_argc;
 
-extern	qboolean	pr_trace;
-extern	dfunction_t	*pr_xfunction;
+extern	int			pr_trace;
+extern	mfunction_t	*pr_xfunction;
 extern	int			pr_xstatement;
 
 extern	unsigned short		pr_crc;
@@ -184,5 +236,8 @@ void PR_Execute_ProgsLoaded(void);
 void ED_PrintEdicts (void);
 void ED_PrintNum (int ent);
 
+#define PR_GetString(num) (pr_strings + num) 
+#define PR_SetString(s)   ((s) != NULL ? (int) (s - pr_strings) : 0)
+
 #endif