eliminated qbyte type, now uses unsigned char throughout the engine for this purpose

[xonotic/darkplaces.git] / protocol.h

diff --git a/protocol.h b/protocol.h
index 398cf838f1b02c515dc4d63bd4d0274f3f6ff02b..27fbf6e2fce1e52e4486614562b91dd677c86dff 100644 (file)
--- a/protocol.h
+++ b/protocol.h
@@ -22,27 +22,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef PROTOCOL_H
 #define PROTOCOL_H
 
 #ifndef PROTOCOL_H
 #define PROTOCOL_H
 

-// LordHavoc: I own protocol ranges 96, 97, 3500-3599
+// protocolversion_t is defined in common.h

 
 

-// quake or darkplaces extended quake entity protocol
-// (still used by TomazQuake and others)
-#define        PROTOCOL_QUAKE 15
-
-// neh_gl entity protocol
-// (failed QSG protocol, used only by nehahra movie)
-#define        PROTOCOL_NEHAHRAMOVIE 250
-
-// entityframe protocol
-#define        PROTOCOL_DARKPLACES1 96
-#define        PROTOCOL_DARKPLACES2 97
-
-// entityframe4 protocol
-#define        PROTOCOL_DARKPLACES3 3500
-#define PROTOCOL_DARKPLACES4 3501
-
-// entityframe5 protocol
-#define PROTOCOL_DARKPLACES5 3502
-#define PROTOCOL_DARKPLACES6 3503
+protocolversion_t Protocol_EnumForName(const char *s);
+const char *Protocol_NameForEnum(protocolversion_t p);
+protocolversion_t Protocol_EnumForNumber(int n);
+int Protocol_NumberForEnum(protocolversion_t p);
+void Protocol_Names(char *buffer, size_t buffersize);

 
 // model effects
 #define        EF_ROCKET       1                       // leave a trail
 
 // model effects
 #define        EF_ROCKET       1                       // leave a trail


@@ -331,7 +317,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define RENDER_TRANSPARENT 262144 // can't light during opaque stage
 
 // this is 80 bytes
 #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)
 {
        // ! means this is not sent to client
        double time; // ! time this state was built (used on client for interpolation)


@@ -366,7 +352,7 @@ typedef struct
 entity_state_t;
 
 // baseline state values
 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
 // reads a quake entity from the network stream
 void EntityFrameQuake_ReadEntity(int bits);
 // writes a list of quake entities to the network stream


@@ -432,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),
 */
 
 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;
 {
        double time;
        int framenum;


@@ -444,7 +430,7 @@ entity_frameinfo_t;
 #define MAX_ENTITY_HISTORY 64
 #define MAX_ENTITY_DATABASE (MAX_EDICTS * 2)
 
 #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
 {
        // 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


@@ -469,7 +455,7 @@ typedef struct
 entityframe_database_t;
 
 // build entity data in this, to pass to entity read/write functions
 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;
 {
        double time;
        int framenum;


@@ -645,7 +631,7 @@ void EntityFrame4_CL_ReadFrame(void);
 // byte = bound(0, s->scale * 16, 255)
 #define E5_SCALE (1<<10)
 // flag
 // 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
 // flag
 #define E5_ANGLES16 (1<<12)
 // flag


@@ -708,7 +694,7 @@ typedef struct entityframe5_packetlog_s
        int packetnumber;
        int numstates;
        entityframe5_changestate_t states[ENTITYFRAME5_MAXSTATES];
        int packetnumber;
        int numstates;
        entityframe5_changestate_t states[ENTITYFRAME5_MAXSTATES];

-       qbyte statsdeltabits[(MAX_CL_STATS+7)/8];
+       unsigned char statsdeltabits[(MAX_CL_STATS+7)/8];

 }
 entityframe5_packetlog_t;
 
 }
 entityframe5_packetlog_t;
 


@@ -716,28 +702,32 @@ typedef struct entityframe5_database_s
 {
        // number of the latest message sent to client
        int latestframenum;
 {
        // 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];
 
 
        // 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
        // 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)
        // priorities of entities (updated whenever deltabits change)
        // (derived from deltabits)

-       qbyte priorities[MAX_EDICTS];
+       unsigned char *priorities; // [maxedicts]

        // last frame this entity was sent on, for prioritzation
        // last frame this entity was sent on, for prioritzation

-       int updateframenum[MAX_EDICTS];
+       int *updateframenum; // [maxedicts]

 
        // database of current status of all entities
 
        // 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)
        // which entities are currently active
        // (duplicate of the active bit of every state in states[])
        // (derived from states)

-       qbyte visiblebits[(MAX_EDICTS+7)/8];
+       unsigned char *visiblebits; // [(maxedicts+7)/8]

 
        // delta compression of stats
 
        // delta compression of stats

-       qbyte statsdeltabits[(MAX_CL_STATS+7)/8];
+       unsigned char statsdeltabits[(MAX_CL_STATS+7)/8];

        int stats[MAX_CL_STATS];
 
        // old notes
        int stats[MAX_CL_STATS];
 
        // old notes


@@ -758,13 +748,12 @@ 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);
 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 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_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);
+void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int numstates, const entity_state_t *states, int viewentnum, int *stats, int movesequence);

 
 extern cvar_t developer_networkentities;
 
 
 extern cvar_t developer_networkentities;