X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=common.h;h=3f6c0ddebe2825dcc9efe3856ca4521e75d1bf1b;hb=6824d8ddc8a43cae0609be5bbe8bee01fa1a4225;hp=990ab6ded12a252b2197bc2838eeb6bb33bbba74;hpb=5ff9dbf2dc269135dd6cf59e93b50da73536f35b;p=xonotic%2Fdarkplaces.git diff --git a/common.h b/common.h index 990ab6de..3f6c0dde 100644 --- a/common.h +++ b/common.h @@ -33,6 +33,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # define MACOSX #endif +#ifdef SUNOS +#include // Needed for FNDELAY +# define model_t dp_model_t // Workaround conflict with /usr/include/sys/model.h +#endif //============================================================================ @@ -40,23 +44,19 @@ 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; + unsigned char *data; 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); -void SZ_Print(sizebuf_t *buf, const char *data); // strcats onto the sizebuf +unsigned char *SZ_GetSpace (sizebuf_t *buf, int length); +void SZ_Write (sizebuf_t *buf, const unsigned char *data, int length); void SZ_HexDumpToConsole(const sizebuf_t *buf); -void Com_HexDumpToConsole(const qbyte *data, int size); +void Com_HexDumpToConsole(const unsigned char *data, int size); -unsigned short CRC_Block(qbyte *data, int size); +unsigned short CRC_Block(const unsigned char *data, size_t size); //============================================================================ @@ -79,8 +79,16 @@ unsigned short CRC_Block(qbyte *data, int size); # if defined(WIN32) # define BYTE_ORDER LITTLE_ENDIAN # else -# warning "Unable to determine the CPU endianess. Defaulting to little endian" -# define BYTE_ORDER LITTLE_ENDIAN +# if defined(SUNOS) +# if defined(__i386) || defined(__amd64) +# define BYTE_ORDER LITTLE_ENDIAN +# else +# define BYTE_ORDER BIG_ENDIAN +# endif +# else +# warning "Unable to determine the CPU endianess. Defaulting to little endian" +# define BYTE_ORDER LITTLE_ENDIAN +# endif # endif #endif @@ -107,29 +115,48 @@ float FloatSwap (float f); #define LittleFloat(l) FloatSwap(l) #endif -unsigned int BuffBigLong (const qbyte *buffer); -unsigned short BuffBigShort (const qbyte *buffer); -unsigned int BuffLittleLong (const qbyte *buffer); -unsigned short BuffLittleShort (const qbyte *buffer); +unsigned int BuffBigLong (const unsigned char *buffer); +unsigned short BuffBigShort (const unsigned char *buffer); +unsigned int BuffLittleLong (const unsigned char *buffer); +unsigned short BuffLittleShort (const unsigned char *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_DARKPLACES7, // added QuakeWorld-style movement protocol to allow more consistent prediction + PROTOCOL_DARKPLACES6, // 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_DARKPLACES4, // 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_DARKPLACES2, // various changes + PROTOCOL_DARKPLACES1, // uses EntityFrame entity snapshot encoder/decoder which is a QuakeWorld-like entity snapshot delta compression method + 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_QUAKE, // quake (aka netquake/normalquake/nq) protocol +} +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); void MSG_WriteLong (sizebuf_t *sb, int c); void MSG_WriteFloat (sizebuf_t *sb, float f); void MSG_WriteString (sizebuf_t *sb, const char *s); +void MSG_WriteUnterminatedString (sizebuf_t *sb, const char *s); void MSG_WriteAngle8i (sizebuf_t *sb, float f); void MSG_WriteAngle16i (sizebuf_t *sb, float f); 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 +183,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); //============================================================================ @@ -218,6 +245,7 @@ typedef enum gamemode_e GAME_PRYDON, GAME_NETHERWORLD, GAME_THEHUNTED, + GAME_DEFEATINDETAIL2, } gamemode_t;