corrected the misspelled name GAME_NEXIUZ (and related things) to GAME_NEXUIZ (and...

[xonotic/darkplaces.git] / progs.h

diff --git a/progs.h b/progs.h
index a8a5f3b7d0320ed07f1db3a391abae9bc9df7756..702c44594baa4ac3b8ed4c54685aa6eb60a85b59 100644 (file)
--- a/progs.h
+++ b/progs.h
@@ -37,16 +37,22 @@ typedef union eval_s
 
 typedef struct link_s
 {
+       void *entity;
        struct link_s   *prev, *next;
 } link_t;
 
+#define ENTITYGRIDAREAS 16
+
 // the entire server entity structure
 typedef struct edict_s
 {
        // true if this edict is unused
        qboolean free;
-       // physics area this edict is linked into
-       link_t area;
+       // 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;
 
        // old entity protocol, not used
 #ifdef QUAKEENTITIES
@@ -108,13 +114,13 @@ extern int eval_viewzoom;
 #define GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (eval_t *)((qbyte *)ed->v + fieldoffset) : NULL)
 
 
-extern dfunction_t *SV_PlayerPhysicsQC;
-extern dfunction_t *EndFrameQC;
+extern mfunction_t *SV_PlayerPhysicsQC;
+extern mfunction_t *EndFrameQC;
 
 //============================================================================
 
 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;
@@ -143,10 +149,10 @@ 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_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);
@@ -186,7 +192,7 @@ extern int pr_numbuiltins;
 extern int             pr_argc;
 
 extern int                     pr_trace;
-extern dfunction_t     *pr_xfunction;
+extern mfunction_t     *pr_xfunction;
 extern int                     pr_xstatement;
 
 extern unsigned short          pr_crc;