reduced uninitialized data size by 13MB by moving some temporary arrays

[xonotic/darkplaces.git] / protocol.h

diff --git a/protocol.h b/protocol.h
index 142544f89319ce69db03f17144155729c7431a81..b12aab92aaaf3a857ed0a7b47d950da8e1f2f33e 100644 (file)
--- a/protocol.h
+++ b/protocol.h
@@ -442,6 +442,22 @@ the Write function performs these steps:
 server updates entities in looping ranges, a frame consists of a range of visible entities (not always all visible entities),
 */
 
+#define MAX_ENTITY_HISTORY 64
+#define MAX_ENTITY_DATABASE (MAX_EDICTS * 2)
+
+// build entity data in this, to pass to entity read/write functions
+typedef struct entity_frame_s
+{
+       double time;
+       int framenum;
+       int numentities;
+       int firstentitynum;
+       int lastentitynum;
+       vec3_t eye;
+       entity_state_t entitydata[MAX_ENTITY_DATABASE];
+}
+entity_frame_t;
+
 typedef struct entity_frameinfo_s
 {
        double time;
@@ -451,9 +467,6 @@ typedef struct entity_frameinfo_s
 }
 entity_frameinfo_t;
 
-#define MAX_ENTITY_HISTORY 64
-#define MAX_ENTITY_DATABASE (MAX_EDICTS * 2)
-
 typedef struct entityframe_database_s
 {
        // note: these can be far out of range, modulo with MAX_ENTITY_DATABASE to get a valid range (which may wrap)
@@ -475,21 +488,12 @@ typedef struct entityframe_database_s
        entity_frameinfo_t frames[MAX_ENTITY_HISTORY];
        // entities
        entity_state_t entitydata[MAX_ENTITY_DATABASE];
-}
-entityframe_database_t;
 
-// build entity data in this, to pass to entity read/write functions
-typedef struct entity_frame_s
-{
-       double time;
-       int framenum;
-       int numentities;
-       int firstentitynum;
-       int lastentitynum;
-       vec3_t eye;
-       entity_state_t entitydata[MAX_ENTITY_DATABASE];
+       // structs for building new frames and reading them
+       entity_frame_t deltaframe;
+       entity_frame_t framedata;
 }
-entity_frame_t;
+entityframe_database_t;
 
 // LordHavoc: these are in approximately sorted order, according to cost and
 // likelyhood of being used for numerous objects in a frame
@@ -705,6 +709,7 @@ void EntityFrame4_CL_ReadFrame(void);
 
 #define ENTITYFRAME5_MAXPACKETLOGS 64
 #define ENTITYFRAME5_MAXSTATES 1024
+#define ENTITYFRAME5_PRIORITYLEVELS 32
 
 typedef struct entityframe5_changestate_s
 {
@@ -762,6 +767,10 @@ typedef struct entityframe5_database_s
        // rather than a memmove to remove them from the start.
        //int numchangestates;
        //entityframe5_changestate_t changestates[MAX_EDICTS];
+
+       // buffers for building priority info
+       int prioritychaincounts[ENTITYFRAME5_PRIORITYLEVELS];
+       unsigned short prioritychains[ENTITYFRAME5_PRIORITYLEVELS][ENTITYFRAME5_MAXSTATES];
 }
 entityframe5_database_t;