X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=common.c;h=6019461a4be949316a6f23a12913af0e74f593c9;hb=e88a73794afa1f0fe65fc70d318f4e288cabc0d1;hp=63d6a2d9a2f8e2235e8d02901ed00eae059209e4;hpb=5e50ce0968fe5404bc5872337ed882f2505dcc9c;p=xonotic%2Fdarkplaces.git diff --git a/common.c b/common.c index 63d6a2d9..6019461a 100644 --- a/common.c +++ b/common.c @@ -40,7 +40,7 @@ const char **com_argv; #define CMDLINE_LENGTH 1024 char com_cmdline[CMDLINE_LENGTH]; -int gamemode; +gamemode_t gamemode; const char *gamename; const char *gamedirname1; const char *gamedirname2; @@ -171,7 +171,7 @@ static unsigned short crctable[256] = 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0 }; -unsigned short CRC_Block(qbyte *data, int size) +unsigned short CRC_Block(const qbyte *data, int size) { unsigned short crc = CRC_INIT_VALUE; while (size--) @@ -273,19 +273,21 @@ void MSG_WriteCoord32f (sizebuf_t *sb, float f) MSG_WriteFloat (sb, f); } -void MSG_WriteCoord (sizebuf_t *sb, float f, int protocol) +void MSG_WriteCoord (sizebuf_t *sb, float f, protocolversion_t protocol) { - if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_NEHAHRAMOVIE) + if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_QUAKEDP || protocol == PROTOCOL_NEHAHRAMOVIE) MSG_WriteCoord13i (sb, f); - else if (protocol == PROTOCOL_DARKPLACES1 || protocol == PROTOCOL_DARKPLACES5 || protocol == PROTOCOL_DARKPLACES6) + else if (protocol == PROTOCOL_DARKPLACES1) MSG_WriteCoord32f (sb, f); else if (protocol == PROTOCOL_DARKPLACES2 || protocol == PROTOCOL_DARKPLACES3 || protocol == PROTOCOL_DARKPLACES4) MSG_WriteCoord16i (sb, f); else - Host_Error("MSG_WriteCoord: unknown protocol\n"); + MSG_WriteCoord32f (sb, f); + //else + // Host_Error("MSG_WriteCoord: unknown protocol\n"); } -void MSG_WriteVector (sizebuf_t *sb, float *v, int protocol) +void MSG_WriteVector (sizebuf_t *sb, float *v, protocolversion_t protocol) { MSG_WriteCoord (sb, v[0], protocol); MSG_WriteCoord (sb, v[1], protocol); @@ -314,12 +316,12 @@ void MSG_WriteAngle32f (sizebuf_t *sb, float f) MSG_WriteFloat (sb, f); } -void MSG_WriteAngle (sizebuf_t *sb, float f, int protocol) +void MSG_WriteAngle (sizebuf_t *sb, float f, protocolversion_t protocol) { - if (protocol == PROTOCOL_DARKPLACES5 || protocol == PROTOCOL_DARKPLACES6) - MSG_WriteAngle16i (sb, f); - else + if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_QUAKEDP || protocol == PROTOCOL_NEHAHRAMOVIE || protocol == PROTOCOL_DARKPLACES1 || protocol == PROTOCOL_DARKPLACES2 || protocol == PROTOCOL_DARKPLACES3 || protocol == PROTOCOL_DARKPLACES4) MSG_WriteAngle8i (sb, f); + else + MSG_WriteAngle16i (sb, f); } // @@ -445,19 +447,19 @@ float MSG_ReadCoord32f (void) return MSG_ReadLittleFloat(); } -float MSG_ReadCoord (int protocol) +float MSG_ReadCoord (protocolversion_t protocol) { - if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_NEHAHRAMOVIE) + if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_QUAKEDP || protocol == PROTOCOL_NEHAHRAMOVIE) return MSG_ReadCoord13i(); - else if (protocol == PROTOCOL_DARKPLACES1 || protocol == PROTOCOL_DARKPLACES5 || protocol == PROTOCOL_DARKPLACES6) + else if (protocol == PROTOCOL_DARKPLACES1) return MSG_ReadCoord32f(); else if (protocol == PROTOCOL_DARKPLACES2 || protocol == PROTOCOL_DARKPLACES3 || protocol == PROTOCOL_DARKPLACES4) return MSG_ReadCoord16i(); - Host_Error("MSG_ReadCoord: unknown protocol\n"); - return 0; + else + return MSG_ReadCoord32f(); } -void MSG_ReadVector (float *v, int protocol) +void MSG_ReadVector (float *v, protocolversion_t protocol) { v[0] = MSG_ReadCoord(protocol); v[1] = MSG_ReadCoord(protocol); @@ -480,36 +482,17 @@ float MSG_ReadAngle32f (void) return MSG_ReadFloat (); } -float MSG_ReadAngle (int protocol) +float MSG_ReadAngle (protocolversion_t protocol) { - if (protocol == PROTOCOL_DARKPLACES5 || protocol == PROTOCOL_DARKPLACES6) - return MSG_ReadAngle16i (); - else + if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_QUAKEDP || protocol == PROTOCOL_NEHAHRAMOVIE || protocol == PROTOCOL_DARKPLACES1 || protocol == PROTOCOL_DARKPLACES2 || protocol == PROTOCOL_DARKPLACES3 || protocol == PROTOCOL_DARKPLACES4) return MSG_ReadAngle8i (); + else + return MSG_ReadAngle16i (); } //=========================================================================== -void SZ_Alloc (sizebuf_t *buf, int startsize, const char *name) -{ - if (startsize < 256) - startsize = 256; - buf->mempool = Mem_AllocPool(name, 0, NULL); - buf->data = Mem_Alloc(buf->mempool, startsize); - buf->maxsize = startsize; - buf->cursize = 0; -} - - -void SZ_Free (sizebuf_t *buf) -{ - Mem_FreePool(&buf->mempool); - buf->data = NULL; - buf->maxsize = 0; - buf->cursize = 0; -} - void SZ_Clear (sizebuf_t *buf) { buf->cursize = 0; @@ -861,7 +844,7 @@ void COM_CheckRegistered (void) { Cvar_Set ("cmdline", com_cmdline); - if (!FS_FileExists("gfx/pop.lmp")) + if (gamemode == GAME_NORMAL && !FS_FileExists("gfx/pop.lmp")) { if (fs_modified) Con_Print("Playing shareware version, with modification.\nwarning: most mods require full quake data.\n"); @@ -982,6 +965,9 @@ static const gamemode_info_t gamemode_info [] = // GAME_NETHERWORLD // COMMANDLINEOPTION: Game: -netherworld runs the game Netherworld: Dark Masters { "netherworld", "-netherworld", "Dark Masters", "id1", "netherworld", "nw", "darkplaces"}, +// GAME_THEHUNTED +// COMMANDLINEOPTION: Game: -netherworld runs the game The Hunted +{ "thehunted", "-thehunted", "The Hunted", "thdata", NULL, "th", "thehunted"}, }; void COM_InitGameType (void) @@ -1017,35 +1003,15 @@ void COM_InitGameType (void) } -extern void Mathlib_Init(void); -extern void FS_Init (void); - /* ================ COM_Init ================ */ -void COM_Init (void) +void COM_Init_Commands (void) { Cvar_RegisterVariable (®istered); Cvar_RegisterVariable (&cmdline); - - Mathlib_Init(); - - FS_Init (); - COM_CheckRegistered (); -} - -extern void FS_Shutdown (void); - -/* -================ -COM_Shutdown -================ -*/ -void COM_Shutdown (void) -{ - FS_Shutdown (); } /* @@ -1067,13 +1033,54 @@ char *va(const char *format, ...) s = string[stringindex]; stringindex = (stringindex + 1) & 7; va_start (argptr, format); - vsnprintf (s, sizeof (string[0]), format,argptr); + dpvsnprintf (s, sizeof (string[0]), format,argptr); va_end (argptr); return s; } +//====================================== + +// snprintf and vsnprintf are NOT portable. Use their DP counterparts instead + +#undef snprintf +#undef vsnprintf + +#ifdef WIN32 +# define snprintf _snprintf +# define vsnprintf _vsnprintf +#endif + + +int dpsnprintf (char *buffer, size_t buffersize, const char *format, ...) +{ + va_list args; + int result; + + va_start (args, format); + result = dpvsnprintf (buffer, buffersize, format, args); + va_end (args); + + return result; +} + + +int dpvsnprintf (char *buffer, size_t buffersize, const char *format, va_list args) +{ + int result; + + result = vsnprintf (buffer, buffersize, format, args); + if (result < 0 || (size_t)result >= buffersize) + { + buffer[buffersize - 1] = '\0'; + return -1; + } + + return result; +} + + //====================================== void COM_ToLowerString (const char *in, char *out, size_t size_out)