X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=common.h;h=f87a0607c72fd07352fe50fb93de360f1adc6b38;hp=b6272a80bb5fac9b55ea6f38ae648972861b6031;hb=091718e089617a7d1d24a4b418df3377bc1f6117;hpb=435b52972823fa8e8ceb9b67797ca3f886f6208a diff --git a/common.h b/common.h index b6272a80..f87a0607 100644 --- a/common.h +++ b/common.h @@ -21,14 +21,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef COMMON_H #define COMMON_H + // MSVC has a different name for several standard functions #ifdef WIN32 -# define snprintf _snprintf -# define vsnprintf _vsnprintf # define strcasecmp stricmp # define strncasecmp strnicmp #endif +// Create our own define for Mac OS X +#if defined(__APPLE__) && defined(__MACH__) +# define MACOSX +#endif + +#ifdef SUNOS +#include // Needed for FNDELAY +# define model_t dp_model_t // Workaround conflict with /usr/include/sys/model.h +#endif //============================================================================ @@ -37,13 +45,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); @@ -52,6 +57,8 @@ void SZ_HexDumpToConsole(const sizebuf_t *buf); void Com_HexDumpToConsole(const qbyte *data, int size); +unsigned short CRC_Block(const qbyte *data, size_t size); + //============================================================================ // Endianess handling @@ -73,8 +80,16 @@ void Com_HexDumpToConsole(const 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 @@ -109,20 +124,40 @@ 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_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_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 @@ -149,8 +184,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_ReadCoord (protocolversion_t protocol); +void MSG_ReadVector (float *v, protocolversion_t protocol); +float MSG_ReadAngle (protocolversion_t protocol); //============================================================================ @@ -164,6 +200,7 @@ extern const char **com_argv; int COM_CheckParm (const char *parm); void COM_Init (void); +void COM_Shutdown (void); void COM_InitArgv (void); void COM_InitGameType (void); @@ -171,34 +208,53 @@ char *va(const char *format, ...); // does a varargs printf into a temp buffer +// snprintf and vsnprintf are NOT portable. Use their DP counterparts instead +#define snprintf DO_NOT_USE_SNPRINTF__USE_DPSNPRINTF +#define vsnprintf DO_NOT_USE_VSNPRINTF__USE_DPVSNPRINTF + +// dpsnprintf and dpvsnprintf +// return the number of printed characters, excluding the final '\0' +// or return -1 if the buffer isn't big enough to contain the entire string. +// buffer is ALWAYS null-terminated +extern int dpsnprintf (char *buffer, size_t buffersize, const char *format, ...); +extern int dpvsnprintf (char *buffer, size_t buffersize, const char *format, va_list args); + + //============================================================================ 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 *gamedirname; +extern const char *gamedirname1; +extern const char *gamedirname2; extern const char *gamescreenshotname; +extern const char *gameuserdirname; extern char com_modname[MAX_OSPATH]; void COM_ToLowerString (const char *in, char *out, size_t size_out); @@ -217,7 +273,7 @@ int matchpattern(char *in, char *pattern, int caseinsensitive); stringlist_t *stringlistappend(stringlist_t *current, char *text); void stringlistfree(stringlist_t *current); stringlist_t *stringlistsort(stringlist_t *start); -stringlist_t *listdirectory(char *path); +stringlist_t *listdirectory(const char *path); void freedirectory(stringlist_t *list); char *SearchInfostring(const char *infostring, const char *key); @@ -225,7 +281,7 @@ char *SearchInfostring(const char *infostring, const char *key); // strlcat and strlcpy, from OpenBSD // Most (all?) BSDs already have them -#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || (defined(__APPLE__) && defined(__MACH__)) +#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(MACOSX) # define HAVE_STRLCAT 1 # define HAVE_STRLCPY 1 #endif