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 8994079a7aa767ea631c207bbe7ee842c31823e7..419ae22cbc7ab5493e29e12a315b567228121566 100644 (file)
--- a/common.h
+++ b/common.h
@@ -112,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);
@@ -124,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
@@ -153,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);
 
 //============================================================================