rewrote protocol version system (including splitting PROTOCOL_QUAKE into PROTOCOL_QUA...

[xonotic/darkplaces.git] / common.h

diff --git a/common.h b/common.h
index 891f6783680a40b26829bd1340832461d4f4651a..419ae22cbc7ab5493e29e12a315b567228121566 100644 (file)
--- a/common.h
+++ b/common.h
@@ -41,13 +41,10 @@ typedef struct sizebuf_s
        qboolean        allowoverflow;  // if false, do a Sys_Error
        qboolean        overflowed;             // set to true if the buffer size failed
        qbyte           *data;
-       mempool_t       *mempool;
        int                     maxsize;
        int                     cursize;
 } sizebuf_t;
 
-void SZ_Alloc (sizebuf_t *buf, int startsize, const char *name);
-void SZ_Free (sizebuf_t *buf);
 void SZ_Clear (sizebuf_t *buf);
 void *SZ_GetSpace (sizebuf_t *buf, int length);
 void SZ_Write (sizebuf_t *buf, const void *data, int length);
@@ -56,7 +53,7 @@ void SZ_HexDumpToConsole(const sizebuf_t *buf);
 
 void Com_HexDumpToConsole(const qbyte *data, int size);
 
-unsigned short CRC_Block(qbyte *data, int size);
+unsigned short CRC_Block(const qbyte *data, int size);
 
 
 //============================================================================
@@ -115,6 +112,24 @@ unsigned short BuffLittleShort (const qbyte *buffer);
 
 //============================================================================
 
+// these versions are purely for internal use, never sent in network protocol
+// (use Protocol_EnumForNumber and Protocol_NumberToEnum to convert)
+typedef enum protocolversion_e
+{
+       PROTOCOL_UNKNOWN,
+       PROTOCOL_QUAKE, // quake (aka netquake/normalquake/nq) protocol
+       PROTOCOL_QUAKEDP, // darkplaces extended quake protocol (used by TomazQuake and others), backwards compatible as long as no extended features are used
+       PROTOCOL_NEHAHRAMOVIE, // Nehahra movie protocol, a big nasty hack dating back to early days of the Quake Standards Group (but only ever used by neh_gl.exe), this is potentially backwards compatible with quake protocol as long as no extended features are used (but in actuality the neh_gl.exe which wrote this protocol ALWAYS wrote the extended information)
+       PROTOCOL_DARKPLACES1, // uses EntityFrame_ entity snapshot encoder/decoder which is a QuakeWorld-like entity snapshot delta compression method
+       PROTOCOL_DARKPLACES2, // various changes
+       PROTOCOL_DARKPLACES3, // uses EntityFrame4 entity snapshot encoder/decoder which is broken, this attempted to do partial snapshot updates on a QuakeWorld-like protocol, but it is broken and impossible to fix
+       PROTOCOL_DARKPLACES4, // various changes
+       PROTOCOL_DARKPLACES5, // uses EntityFrame5 entity snapshot encoder/decoder which is based on a Tribes networking article at http://www.garagegames.com/articles/networking1/
+       PROTOCOL_DARKPLACES6, // various changes
+       PROTOCOL_DARKPLACES7, // added QuakeWorld-style movement protocol to allow more consistent prediction
+}
+protocolversion_t;
+
 void MSG_WriteChar (sizebuf_t *sb, int c);
 void MSG_WriteByte (sizebuf_t *sb, int c);
 void MSG_WriteShort (sizebuf_t *sb, int c);
@@ -127,9 +142,9 @@ void MSG_WriteAngle32f (sizebuf_t *sb, float f);
 void MSG_WriteCoord13i (sizebuf_t *sb, float f);
 void MSG_WriteCoord16i (sizebuf_t *sb, float f);
 void MSG_WriteCoord32f (sizebuf_t *sb, float f);
-void MSG_WriteCoord (sizebuf_t *sb, float f, int protocol);
-void MSG_WriteVector (sizebuf_t *sb, float *v, int protocol);
-void MSG_WriteAngle (sizebuf_t *sb, float f, int protocol);
+void MSG_WriteCoord (sizebuf_t *sb, float f, protocolversion_t protocol);
+void MSG_WriteVector (sizebuf_t *sb, float *v, protocolversion_t protocol);
+void MSG_WriteAngle (sizebuf_t *sb, float f, protocolversion_t protocol);
 
 extern int                     msg_readcount;
 extern qboolean        msg_badread;            // set if a read goes beyond end of message
@@ -156,9 +171,9 @@ float MSG_ReadAngle32f (void);
 float MSG_ReadCoord13i (void);
 float MSG_ReadCoord16i (void);
 float MSG_ReadCoord32f (void);
-float MSG_ReadCoord (int protocol);
-void MSG_ReadVector (float *v, int protocol);
-float MSG_ReadAngle (int protocol);
+float MSG_ReadCoord (protocolversion_t protocol);
+void MSG_ReadVector (float *v, protocolversion_t protocol);
+float MSG_ReadAngle (protocolversion_t protocol);
 
 //============================================================================
 
@@ -197,26 +212,31 @@ extern int dpvsnprintf (char *buffer, size_t buffersize, const char *format, va_
 extern struct cvar_s   registered;
 extern struct cvar_s   cmdline;
 
-#define GAME_NORMAL 0
-#define GAME_HIPNOTIC 1
-#define GAME_ROGUE 2
-#define GAME_NEHAHRA 3
-#define GAME_NEXUIZ 4
-#define GAME_TRANSFUSION 5
-#define GAME_GOODVSBAD2 6
-#define GAME_TEU 7
-#define GAME_BATTLEMECH 8
-#define GAME_ZYMOTIC 9
-#define GAME_FNIGGIUM 10
-#define GAME_SETHERAL 11
-#define GAME_SOM 12
-#define GAME_TENEBRAE 13 // full of evil hackery
-#define GAME_NEOTERIC 14
-#define GAME_OPENQUARTZ 15 //this game sucks
-#define GAME_PRYDON 16
-#define GAME_NETHERWORLD 17
-
-extern int gamemode;
+typedef enum gamemode_e
+{
+       GAME_NORMAL,
+       GAME_HIPNOTIC,
+       GAME_ROGUE,
+       GAME_NEHAHRA,
+       GAME_NEXUIZ,
+       GAME_TRANSFUSION,
+       GAME_GOODVSBAD2,
+       GAME_TEU,
+       GAME_BATTLEMECH,
+       GAME_ZYMOTIC,
+       GAME_FNIGGIUM,
+       GAME_SETHERAL,
+       GAME_SOM,
+       GAME_TENEBRAE, // full of evil hackery
+       GAME_NEOTERIC,
+       GAME_OPENQUARTZ, //this game sucks
+       GAME_PRYDON,
+       GAME_NETHERWORLD,
+       GAME_THEHUNTED,
+}
+gamemode_t;
+
+extern gamemode_t gamemode;
 extern const char *gamename;
 extern const char *gamedirname1;
 extern const char *gamedirname2;