gave names to nearly all structs and enums which should make for better C++ error...

[xonotic/darkplaces.git] / protocol.h

diff --git a/protocol.h b/protocol.h
index b749fe6a4e525b7d9659bcc44d6f50d7b469d1ef..211043b4f360feed8e9f017629e9a83b7b652292 100644 (file)
--- a/protocol.h
+++ b/protocol.h
@@ -317,7 +317,7 @@ void Protocol_Names(char *buffer, size_t buffersize);
 #define RENDER_TRANSPARENT 262144 // can't light during opaque stage
 
 // this is 80 bytes
-typedef struct
+typedef struct entity_state_s
 {
        // ! means this is not sent to client
        double time; // ! time this state was built (used on client for interpolation)
@@ -352,7 +352,7 @@ typedef struct
 entity_state_t;
 
 // baseline state values
-entity_state_t defaultstate;
+extern entity_state_t defaultstate;
 // reads a quake entity from the network stream
 void EntityFrameQuake_ReadEntity(int bits);
 // writes a list of quake entities to the network stream
@@ -418,7 +418,7 @@ 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),
 */
 
-typedef struct
+typedef struct entity_frameinfo_s
 {
        double time;
        int framenum;
@@ -430,7 +430,7 @@ entity_frameinfo_t;
 #define MAX_ENTITY_HISTORY 64
 #define MAX_ENTITY_DATABASE (MAX_EDICTS * 2)
 
-typedef struct
+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)
        // start and end of used area, when adding a new update to database, store at endpos, and increment endpos
@@ -455,7 +455,7 @@ typedef struct
 entityframe_database_t;
 
 // build entity data in this, to pass to entity read/write functions
-typedef struct
+typedef struct entity_frame_s
 {
        double time;
        int framenum;