inlined the only call of R_ModelLightPoint (in R_LightModel)

[xonotic/darkplaces.git] / progs.h

diff --git a/progs.h b/progs.h
index 6d3fb99946a220721207aa363929c0478eaa6151..702c44594baa4ac3b8ed4c54685aa6eb60a85b59 100644 (file)
--- a/progs.h
+++ b/progs.h
@@ -48,10 +48,11 @@ 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
@@ -148,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);