fixed a bug in CL_ParseClientdata that was breaking on hipnotic demos

[xonotic/darkplaces.git] / protocol.h

diff --git a/protocol.h b/protocol.h
index 398cf838f1b02c515dc4d63bd4d0274f3f6ff02b..b0ff854dd5f2d55858d95e95f4f4f9440bcac927 100644 (file)
--- a/protocol.h
+++ b/protocol.h
@@ -645,7 +645,7 @@ void EntityFrame4_CL_ReadFrame(void);
 // byte = bound(0, s->scale * 16, 255)
 #define E5_SCALE (1<<10)
 // flag
-#define E5_ORIGIN32 (1<<11) 
+#define E5_ORIGIN32 (1<<11)
 // flag
 #define E5_ANGLES16 (1<<12)
 // flag
@@ -716,25 +716,29 @@ typedef struct entityframe5_database_s
 {
        // number of the latest message sent to client
        int latestframenum;
+       // updated by WriteFrame for internal use
+       int viewentnum;
 
        // logs of all recently sent messages (between acked and latest)
        entityframe5_packetlog_t packetlog[ENTITYFRAME5_MAXPACKETLOGS];
 
+       // this goes up as needed and causes all the arrays to be reallocated
+       int maxedicts;
+
        // which properties of each entity have changed since last send
-       int deltabits[MAX_EDICTS];
+       int *deltabits; // [maxedicts]
        // priorities of entities (updated whenever deltabits change)
        // (derived from deltabits)
-       qbyte priorities[MAX_EDICTS];
+       qbyte *priorities; // [maxedicts]
        // last frame this entity was sent on, for prioritzation
-       int updateframenum[MAX_EDICTS];
+       int *updateframenum; // [maxedicts]
 
        // database of current status of all entities
-       // (FIXME: this is 2.5mb per client even if most is unused!)
-       entity_state_t states[MAX_EDICTS];
+       entity_state_t *states; // [maxedicts]
        // which entities are currently active
        // (duplicate of the active bit of every state in states[])
        // (derived from states)
-       qbyte visiblebits[(MAX_EDICTS+7)/8];
+       qbyte *visiblebits; // [(maxedicts+7)/8]
 
        // delta compression of stats
        qbyte statsdeltabits[(MAX_CL_STATS+7)/8];
@@ -758,11 +762,10 @@ entityframe5_database_t;
 entityframe5_database_t *EntityFrame5_AllocDatabase(mempool_t *pool);
 void EntityFrame5_FreeDatabase(entityframe5_database_t *d);
 void EntityFrame5_ResetDatabase(entityframe5_database_t *d);
-int EntityState5_Priority(entityframe5_database_t *d, entity_state_t *view, entity_state_t *s, int changedbits, int age);
 void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbits, sizebuf_t *msg);
 int EntityState5_DeltaBitsForState(entity_state_t *o, entity_state_t *n);
 void EntityFrame5_CL_ReadFrame(void);
-void EntityFrame5_LostFrame(entityframe5_database_t *d, int framenum, int viewentnum);
+void EntityFrame5_LostFrame(entityframe5_database_t *d, int framenum);
 void EntityFrame5_AckFrame(entityframe5_database_t *d, int framenum);
 void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int numstates, const entity_state_t *states, int viewentnum, int *stats);