X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=common.c;h=3859d20bde55cc0205b71f02438add599dd4df22;hp=142af2dc594ca73936bca2c4ccf60b0ba210c679;hb=281412c28688a491cc4124f0c5ec783a409df820;hpb=91183a9cf607baeda22603b56d904b252006b8b4 diff --git a/common.c b/common.c index 142af2dc..3859d20b 100644 --- a/common.c +++ b/common.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -19,68 +19,45 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // common.c -- misc functions used in client and server +#include #include -#ifndef WIN32 +#ifdef WIN32 +#include +#else #include #endif -#include #include "quakedef.h" #define NUM_SAFE_ARGVS 7 -static char *largv[MAX_NUM_ARGVS + NUM_SAFE_ARGVS + 1]; -static char *argvdummy = " "; +static char *largv[MAX_NUM_ARGVS + NUM_SAFE_ARGVS + 1]; +static char *argvdummy = " "; -static char *safeargvs[NUM_SAFE_ARGVS] = - {"-stdvid", "-nolan", "-nosound", "-nocdaudio", "-nojoy", "-nomouse", "-dibonly"}; +static char *safeargvs[NUM_SAFE_ARGVS] = + {"-stdvid", "-nolan", "-nosound", "-nocdaudio", "-nojoy", "-nomouse", "-window"}; -cvar_t registered = {"registered","0"}; -cvar_t cmdline = {"cmdline","0", false, true}; +cvar_t registered = {0, "registered","0"}; +cvar_t cmdline = {0, "cmdline","0"}; -qboolean com_modified; // set true if using non-id files +mempool_t *pak_mempool; -qboolean proghack; +qboolean com_modified; // set true if using non-id files -int static_registered = 1; // only for startup check, then set - -qboolean msg_suppress_1 = 0; +qboolean msg_suppress_1 = 0; void COM_InitFilesystem (void); -// if a packfile directory differs from this, it is assumed to be hacked -#define PAK0_COUNT 339 -#define PAK0_CRC 32981 - -char com_token[1024]; -int com_argc; -char **com_argv; +char com_token[1024]; +int com_argc; +char **com_argv; -#define CMDLINE_LENGTH 256 -char com_cmdline[CMDLINE_LENGTH]; +// LordHavoc: made commandline 1024 characters instead of 256 +#define CMDLINE_LENGTH 1024 +char com_cmdline[CMDLINE_LENGTH]; -qboolean standard_quake = true, rogue = false, hipnotic = false, nehahra = false; - -// this graphic needs to be in the pak file to use registered features -unsigned short pop[] = -{ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000 -,0x0000,0x0000,0x6600,0x0000,0x0000,0x0000,0x6600,0x0000 -,0x0000,0x0066,0x0000,0x0000,0x0000,0x0000,0x0067,0x0000 -,0x0000,0x6665,0x0000,0x0000,0x0000,0x0000,0x0065,0x6600 -,0x0063,0x6561,0x0000,0x0000,0x0000,0x0000,0x0061,0x6563 -,0x0064,0x6561,0x0000,0x0000,0x0000,0x0000,0x0061,0x6564 -,0x0064,0x6564,0x0000,0x6469,0x6969,0x6400,0x0064,0x6564 -,0x0063,0x6568,0x6200,0x0064,0x6864,0x0000,0x6268,0x6563 -,0x0000,0x6567,0x6963,0x0064,0x6764,0x0063,0x6967,0x6500 -,0x0000,0x6266,0x6769,0x6a68,0x6768,0x6a69,0x6766,0x6200 -,0x0000,0x0062,0x6566,0x6666,0x6666,0x6666,0x6562,0x0000 -,0x0000,0x0000,0x0062,0x6364,0x6664,0x6362,0x0000,0x0000 -,0x0000,0x0000,0x0000,0x0062,0x6662,0x0000,0x0000,0x0000 -,0x0000,0x0000,0x0000,0x0061,0x6661,0x0000,0x0000,0x0000 -,0x0000,0x0000,0x0000,0x0000,0x6500,0x0000,0x0000,0x0000 -,0x0000,0x0000,0x0000,0x0000,0x6400,0x0000,0x0000,0x0000 -}; +int gamemode; +char *gamename; /* @@ -100,39 +77,12 @@ into the cache directory, then opened there. FIXME: The file "parms.txt" will be read out of the game directory and appended to the current command line arguments to allow different games to initialize startup parms differently. This could be used to add a "-sspeed 22050" for the high quality sound edition. Because they are added at the end, they will not override an explicit setting on the original command line. - + */ //============================================================================ -// ClearLink is used for new headnodes -void ClearLink (link_t *l) -{ - l->prev = l->next = l; -} - -void RemoveLink (link_t *l) -{ - l->next->prev = l->prev; - l->prev->next = l->next; -} - -void InsertLinkBefore (link_t *l, link_t *before) -{ - l->next = before; - l->prev = before->prev; - l->prev->next = l; - l->next->prev = l; -} -void InsertLinkAfter (link_t *l, link_t *after) -{ - l->next = after->next; - l->prev = after; - l->prev->next = l; - l->next->prev = l; -} - /* ============================================================================ @@ -141,130 +91,10 @@ void InsertLinkAfter (link_t *l, link_t *after) ============================================================================ */ -/* -void Q_memset (void *dest, int fill, int count) -{ - int i; - - if ( (((long)dest | count) & 3) == 0) - { - count >>= 2; - fill = fill | (fill<<8) | (fill<<16) | (fill<<24); - for (i=0 ; i>=2; - for (i=0 ; i= 'a' && c1 <= 'z') @@ -284,10 +114,8 @@ int Q_strncasecmp (char *s1, char *s2, int n) } if (!c1) return 0; // strings are equal -// s1++; -// s2++; } - + return -1; } @@ -295,141 +123,6 @@ int Q_strcasecmp (char *s1, char *s2) { return Q_strncasecmp (s1, s2, 99999); } -/* -int Q_atoi (char *str) -{ - int val; - int sign; - int c; - - if (*str == '-') - { - sign = -1; - str++; - } - else - sign = 1; - - val = 0; - -// -// check for hex -// - if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X') ) - { - str += 2; - while (1) - { - c = *str++; - if (c >= '0' && c <= '9') - val = (val<<4) + c - '0'; - else if (c >= 'a' && c <= 'f') - val = (val<<4) + c - 'a' + 10; - else if (c >= 'A' && c <= 'F') - val = (val<<4) + c - 'A' + 10; - else - return val*sign; - } - } - -// -// check for character -// - if (str[0] == '\'') - { - return sign * str[1]; - } - -// -// assume decimal -// - while (1) - { - c = *str++; - if (c <'0' || c > '9') - return val*sign; - val = val*10 + c - '0'; - } - - return 0; -} - - -float Q_atof (char *str) -{ - double val; - int sign; - int c; - int decimal, total; - - if (*str == '-') - { - sign = -1; - str++; - } - else - sign = 1; - - val = 0; - -// -// check for hex -// - if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X') ) - { - str += 2; - while (1) - { - c = *str++; - if (c >= '0' && c <= '9') - val = (val*16) + c - '0'; - else if (c >= 'a' && c <= 'f') - val = (val*16) + c - 'a' + 10; - else if (c >= 'A' && c <= 'F') - val = (val*16) + c - 'A' + 10; - else - return val*sign; - } - } - -// -// check for character -// - if (str[0] == '\'') - { - return sign * str[1]; - } - -// -// assume decimal -// - decimal = -1; - total = 0; - while (1) - { - c = *str++; - if (c == '.') - { - decimal = total; - continue; - } - if (c <'0' || c > '9') - break; - val = val*10 + c - '0'; - total++; - } - - if (decimal == -1) - return val*sign; - while (total > decimal) - { - val /= 10; - total--; - } - - return val*sign; -} -*/ /* ============================================================================ @@ -439,7 +132,7 @@ float Q_atof (char *str) ============================================================================ */ -#ifndef WIN32 +#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) short (*BigShort) (short l); short (*LittleShort) (short l); int (*BigLong) (int l); @@ -450,7 +143,7 @@ float (*LittleFloat) (float l); short ShortSwap (short l) { - byte b1,b2; + qbyte b1,b2; b1 = l&255; b2 = (l>>8)&255; @@ -458,14 +151,16 @@ short ShortSwap (short l) return (b1<<8) + b2; } +#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) short ShortNoSwap (short l) { return l; } +#endif int LongSwap (int l) { - byte b1,b2,b3,b4; + qbyte b1,b2,b3,b4; b1 = l&255; b2 = (l>>8)&255; @@ -475,20 +170,22 @@ int LongSwap (int l) return ((int)b1<<24) + ((int)b2<<16) + ((int)b3<<8) + b4; } +#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) int LongNoSwap (int l) { return l; } +#endif float FloatSwap (float f) { union { float f; - byte b[4]; + qbyte b[4]; } dat1, dat2; - - + + dat1.f = f; dat2.b[0] = dat1.b[3]; dat2.b[1] = dat1.b[2]; @@ -497,10 +194,12 @@ float FloatSwap (float f) return dat2.f; } +#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) float FloatNoSwap (float f) { return f; } +#endif /* ============================================================================== @@ -517,38 +216,23 @@ Handles byte ordering and avoids alignment errors void MSG_WriteChar (sizebuf_t *sb, int c) { - byte *buf; + qbyte *buf; -//#ifdef PARANOID -// if (c < -128 || c > 127) -// Sys_Error ("MSG_WriteChar: range error"); -//#endif - buf = SZ_GetSpace (sb, 1); buf[0] = c; } void MSG_WriteByte (sizebuf_t *sb, int c) { - byte *buf; + qbyte *buf; -//#ifdef PARANOID -// if (c < 0 || c > 255) -// Sys_Error ("MSG_WriteByte: range error"); -//#endif - buf = SZ_GetSpace (sb, 1); buf[0] = c; } void MSG_WriteShort (sizebuf_t *sb, int c) { - byte *buf; - -//#ifdef PARANOID -// if (c < ((short)0x8000) || c > (short)0x7fff) -// Sys_Error ("MSG_WriteShort: range error"); -//#endif + qbyte *buf; buf = SZ_GetSpace (sb, 2); buf[0] = c&0xff; @@ -557,8 +241,8 @@ void MSG_WriteShort (sizebuf_t *sb, int c) void MSG_WriteLong (sizebuf_t *sb, int c) { - byte *buf; - + qbyte *buf; + buf = SZ_GetSpace (sb, 4); buf[0] = c&0xff; buf[1] = (c>>8)&0xff; @@ -573,11 +257,11 @@ void MSG_WriteFloat (sizebuf_t *sb, float f) float f; int l; } dat; - - + + dat.f = f; dat.l = LittleLong (dat.l); - + SZ_Write (sb, &dat.l, 4); } @@ -589,33 +273,30 @@ void MSG_WriteString (sizebuf_t *sb, char *s) SZ_Write (sb, s, strlen(s)+1); } -// used by server (always dpprotocol) -// moved to common.h as #define -/* -void MSG_WriteFloatCoord (sizebuf_t *sb, float f) -{ - MSG_WriteFloat(sb, f); -} -*/ - -// used by client -void MSG_WriteCoord (sizebuf_t *sb, float f) +// used by server (always latest dpprotocol) +void MSG_WriteDPCoord (sizebuf_t *sb, float f) { - if (dpprotocol) - MSG_WriteFloat(sb, f); + if (f >= 0) + MSG_WriteShort (sb, (int)(f + 0.5f)); else - MSG_WriteShort (sb, (int)(f*8.0f + 0.5f)); + MSG_WriteShort (sb, (int)(f - 0.5f)); } void MSG_WritePreciseAngle (sizebuf_t *sb, float f) { - MSG_WriteShort (sb, (int)(f*(65536.0f/360.0f) + 0.5f) & 65535); + if (f >= 0) + MSG_WriteShort (sb, (int)(f*(65536.0f/360.0f) + 0.5f) & 65535); + else + MSG_WriteShort (sb, (int)(f*(65536.0f/360.0f) - 0.5f) & 65535); } -// LordHavoc: round to nearest value, rather than rounding down, fixes crosshair problem +// LordHavoc: round to nearest value, rather than rounding toward zero, fixes crosshair problem void MSG_WriteAngle (sizebuf_t *sb, float f) { - MSG_WriteByte (sb, (int)(f*(256.0f/360.0f) + 0.5f) & 255); + if (f >= 0) + MSG_WriteByte (sb, (int)(f*(256.0f/360.0f) + 0.5f) & 255); + else + MSG_WriteByte (sb, (int)(f*(256.0f/360.0f) - 0.5f) & 255); } // @@ -630,80 +311,41 @@ void MSG_BeginReading (void) msg_badread = false; } -/* -// returns -1 and sets msg_badread if no more characters are available -int MSG_ReadChar (void) -{ - int c; - - // LordHavoc: minor optimization - if (msg_readcount >= net_message.cursize) -// if (msg_readcount+1 > net_message.cursize) - { - msg_badread = true; - return -1; - } - - c = (signed char)net_message.data[msg_readcount]; - msg_readcount++; - - return c; -} - -int MSG_ReadByte (void) -{ - int c; - - // LordHavoc: minor optimization - if (msg_readcount >= net_message.cursize) -// if (msg_readcount+1 > net_message.cursize) - { - msg_badread = true; - return -1; - } - - c = (unsigned char)net_message.data[msg_readcount]; - msg_readcount++; - - return c; -} -*/ - int MSG_ReadShort (void) { int c; - + if (msg_readcount+2 > net_message.cursize) { msg_badread = true; return -1; } - + c = (short)(net_message.data[msg_readcount] + (net_message.data[msg_readcount+1]<<8)); - + msg_readcount += 2; - + return c; } int MSG_ReadLong (void) { int c; - + if (msg_readcount+4 > net_message.cursize) { msg_badread = true; return -1; } - + c = net_message.data[msg_readcount] + (net_message.data[msg_readcount+1]<<8) + (net_message.data[msg_readcount+2]<<16) + (net_message.data[msg_readcount+3]<<24); - + msg_readcount += 4; - + return c; } @@ -711,27 +353,27 @@ float MSG_ReadFloat (void) { union { - byte b[4]; + qbyte b[4]; float f; int l; } dat; - + dat.b[0] = net_message.data[msg_readcount]; dat.b[1] = net_message.data[msg_readcount+1]; dat.b[2] = net_message.data[msg_readcount+2]; dat.b[3] = net_message.data[msg_readcount+3]; msg_readcount += 4; - + dat.l = LittleLong (dat.l); - return dat.f; + return dat.f; } char *MSG_ReadString (void) { static char string[2048]; int l,c; - + l = 0; do { @@ -741,55 +383,38 @@ char *MSG_ReadString (void) string[l] = c; l++; } while (l < sizeof(string)-1); - + string[l] = 0; - + return string; } -// used by server (always dpprotocol) -// moved to common.h as #define -/* -float MSG_ReadFloatCoord (void) +// used by server (always latest dpprotocol) +float MSG_ReadDPCoord (void) { - return MSG_ReadFloat(); + return (signed short) MSG_ReadShort(); } -*/ // used by client float MSG_ReadCoord (void) { - if (dpprotocol) + if (dpprotocol == DPPROTOCOL_VERSION2 || dpprotocol == DPPROTOCOL_VERSION3) + return (signed short) MSG_ReadShort(); + else if (dpprotocol == DPPROTOCOL_VERSION1) return MSG_ReadFloat(); else return MSG_ReadShort() * (1.0f/8.0f); } -/* -float MSG_ReadCoord (void) -{ - return MSG_ReadShort() * (1.0f/8.0f); -} - -float MSG_ReadAngle (void) -{ - return MSG_ReadChar() * (360.0f/256.0f); -} - -float MSG_ReadPreciseAngle (void) -{ - return MSG_ReadShort() * (360.0f/65536); -} -*/ - //=========================================================================== -void SZ_Alloc (sizebuf_t *buf, int startsize) +void SZ_Alloc (sizebuf_t *buf, int startsize, char *name) { if (startsize < 256) startsize = 256; - buf->data = Hunk_AllocName (startsize, "sizebuf"); + buf->mempool = Mem_AllocPool(name); + buf->data = Mem_Alloc(buf->mempool, startsize); buf->maxsize = startsize; buf->cursize = 0; } @@ -797,9 +422,9 @@ void SZ_Alloc (sizebuf_t *buf, int startsize) void SZ_Free (sizebuf_t *buf) { -// Z_Free (buf->data); -// buf->data = NULL; -// buf->maxsize = 0; + Mem_FreePool(&buf->mempool); + buf->data = NULL; + buf->maxsize = 0; buf->cursize = 0; } @@ -811,18 +436,18 @@ void SZ_Clear (sizebuf_t *buf) void *SZ_GetSpace (sizebuf_t *buf, int length) { void *data; - + if (buf->cursize + length > buf->maxsize) { if (!buf->allowoverflow) - Host_Error ("SZ_GetSpace: overflow without allowoverflow set - use -zone on the commandline for more zone memory, default: 128k (quake original default was 48k)"); - + Host_Error ("SZ_GetSpace: overflow without allowoverflow set"); + if (length > buf->maxsize) Host_Error ("SZ_GetSpace: %i is > full buffer size", length); - + buf->overflowed = true; Con_Printf ("SZ_GetSpace: overflow"); - SZ_Clear (buf); + SZ_Clear (buf); } data = buf->data + buf->cursize; @@ -844,9 +469,9 @@ void SZ_Print (sizebuf_t *buf, char *data) // byte * cast to keep VC++ happy if (buf->data[buf->cursize-1]) - memcpy ((byte *)SZ_GetSpace(buf, len),data,len); // no trailing 0 + memcpy ((qbyte *)SZ_GetSpace(buf, len),data,len); // no trailing 0 else - memcpy ((byte *)SZ_GetSpace(buf, len-1)-1,data,len); // write over trailing 0 + memcpy ((qbyte *)SZ_GetSpace(buf, len-1)-1,data,len); // write over trailing 0 } @@ -861,7 +486,7 @@ COM_SkipPath char *COM_SkipPath (char *pathname) { char *last; - + last = pathname; while (*pathname) { @@ -877,11 +502,20 @@ char *COM_SkipPath (char *pathname) COM_StripExtension ============ */ +// LordHavoc: replacement for severely broken COM_StripExtension that was used in original quake. void COM_StripExtension (char *in, char *out) { - while (*in && *in != '.') + char *last = NULL; + while (*in) + { + if (*in == '.') + last = out; + else if (*in == '/' || *in == '\\' || *in == ':') + last = NULL; *out++ = *in++; - *out = 0; + } + if (last) + *last = 0; } /* @@ -1077,40 +711,18 @@ being registered. */ void COM_CheckRegistered (void) { - QFile *h; - unsigned short check[128]; - int i; - Cvar_Set ("cmdline", com_cmdline); - COM_FOpenFile("gfx/pop.lmp", &h, false, true); - static_registered = 0; - - if (!h) + if (!Sys_FileTime("gfx/pop.lmp")) { if (com_modified) Con_Printf ("Playing shareware version, with modification.\nwarning: most mods require full quake data.\n"); else Con_Printf ("Playing shareware version.\n"); -//#if WINDED -// Sys_Error ("This dedicated server requires a full registered copy of Quake"); -//#endif -// Con_Printf ("Playing shareware version.\n"); -// if (com_modified) -// Sys_Error ("You must have the registered version to use modified games"); return; } - Qread (h, check, sizeof(check)); - Qclose (h); - - for (i=0 ; i<128 ; i++) - if (pop[i] != (unsigned short)BigShort (check[i])) - Sys_Error ("Corrupted data file."); - -// Cvar_Set ("cmdline", com_cmdline); Cvar_Set ("registered", "1"); - static_registered = 1; Con_Printf ("Playing registered version.\n"); } @@ -1172,78 +784,71 @@ void COM_InitArgv (int argc, char **argv) largv[com_argc] = argvdummy; com_argv = largv; -#ifdef NEHAHRA - nehahra = true; - standard_quake = false; +#if BLOODBATH + gamemode = GAME_BLOODBATH; +#elif ZYMOTIC + gamemode = GAME_ZYMOTIC; +#elif FIENDARENA + gamemode = GAME_FIENDARENA; +#elif NEHAHRA + gamemode = GAME_NEHAHRA; #else - if (COM_CheckParm ("-rogue")) - { - rogue = true; - standard_quake = false; - } - - if (COM_CheckParm ("-hipnotic")) - { - hipnotic = true; - standard_quake = false; - } - - if (COM_CheckParm ("-nehahra")) + if (COM_CheckParm ("-bloodbath")) + gamemode = GAME_BLOODBATH; + else if (COM_CheckParm ("-zymotic")) + gamemode = GAME_ZYMOTIC; + else if (COM_CheckParm ("-fiendarena")) + gamemode = GAME_FIENDARENA; + else if (COM_CheckParm ("-nehahra")) + gamemode = GAME_NEHAHRA; + else if (COM_CheckParm ("-hipnotic")) + gamemode = GAME_HIPNOTIC; + else if (COM_CheckParm ("-rogue")) + gamemode = GAME_ROGUE; +#endif + switch(gamemode) { - nehahra = true; - standard_quake = false; + case GAME_NORMAL: + gamename = "DarkPlaces"; + break; + case GAME_HIPNOTIC: + gamename = "Darkplaces-Hipnotic"; + break; + case GAME_ROGUE: + gamename = "Darkplaces-Rogue"; + break; + case GAME_NEHAHRA: + gamename = "DarkPlaces-Nehahra"; + break; + case GAME_FIENDARENA: + gamename = "FiendArena"; + break; + case GAME_ZYMOTIC: + gamename = "Zymotic"; + break; + case GAME_BLOODBATH: + gamename = "BloodBath"; + break; + default: + Sys_Error("COM_InitArgv: unknown gamemode %i\n", gamemode); + break; } -#endif -} - - -unsigned int qmalloctotal_alloc, qmalloctotal_alloccount, qmalloctotal_free, qmalloctotal_freecount; - -void *qmalloc(unsigned int size) -{ - unsigned int *mem; - qmalloctotal_alloc += size; - qmalloctotal_alloccount++; - mem = malloc(size+sizeof(unsigned int)); - if (!mem) - return mem; - *mem = size; - return (void *)(mem + 1); -} - -void qfree(void *mem) -{ - unsigned int *m; - if (!mem) - return; - m = mem; - m--; // back up to size - qmalloctotal_free += *m; // size - qmalloctotal_freecount++; - free(m); } -extern void GL_TextureStats_PrintTotal(void); -extern int hunk_low_used, hunk_high_used, hunk_size; -void COM_Memstats_f(void) -{ - Con_Printf("%i malloc calls totalling %i bytes (%.4gMB)\n%i free calls totalling %i bytes (%.4gMB)\n%i bytes (%.4gMB) currently allocated\n", qmalloctotal_alloccount, qmalloctotal_alloc, qmalloctotal_alloc / 1048576.0, qmalloctotal_freecount, qmalloctotal_free, qmalloctotal_free / 1048576.0, qmalloctotal_alloc - qmalloctotal_free, (qmalloctotal_alloc - qmalloctotal_free) / 1048576.0); - GL_TextureStats_PrintTotal(); - Con_Printf ("%i bytes (%.4gMB) of %.4gMB hunk in use\n", hunk_low_used + hunk_high_used, (hunk_low_used + hunk_high_used) / 1048576.0, hunk_size / 1048576.0); -} +extern void Mathlib_Init(void); /* ================ COM_Init ================ */ -void COM_Init (char *basedir) +void COM_Init (void) { -#ifndef WIN32 - byte swaptest[2] = {1,0}; +#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) + qbyte swaptest[2] = {1,0}; -// set the byte swapping variables in a portable manner +// set the byte swapping variables in a portable manner if ( *(short *)swaptest == 1) { BigShort = ShortSwap; @@ -1264,10 +869,13 @@ void COM_Init (char *basedir) } #endif + pak_mempool = Mem_AllocPool("paks"); + Cvar_RegisterVariable (®istered); Cvar_RegisterVariable (&cmdline); Cmd_AddCommand ("path", COM_Path_f); - Cmd_AddCommand ("memstats", COM_Memstats_f); + + Mathlib_Init(); COM_InitFilesystem (); COM_CheckRegistered (); @@ -1285,28 +893,21 @@ FIXME: make this buffer size safe someday */ char *va(char *format, ...) { - va_list argptr; - static char string[1024]; - + va_list argptr; + // LordHavoc: now cycles through 8 buffers to avoid problems in most cases + static char string[8][1024], *s; + static int stringindex = 0; + + s = string[stringindex]; + stringindex = (stringindex + 1) & 7; va_start (argptr, format); - vsprintf (string, format,argptr); + vsprintf (s, format,argptr); va_end (argptr); - return string; + return s; } -/// just for debugging -int memsearch (byte *start, int count, int search) -{ - int i; - - for (i=0 ; inext) { @@ -1401,11 +1006,12 @@ LordHavoc: Previously only used for CopyFile, now also used for COM_WriteFile. void COM_CreatePath (char *path) { char *ofs, save; - + for (ofs = path+1 ; *ofs ; ofs++) { - if (*ofs == '/' || *ofs == '\\' || *ofs == ':') - { // create the directory + if (*ofs == '/' || *ofs == '\\') + { + // create the directory save = *ofs; *ofs = 0; Sys_mkdir (path); @@ -1422,11 +1028,11 @@ COM_WriteFile The filename will be prefixed by the current game directory ============ */ -void COM_WriteFile (char *filename, void *data, int len) +qboolean COM_WriteFile (char *filename, void *data, int len) { int handle; char name[MAX_OSPATH]; - + sprintf (name, "%s/%s", com_gamedir, filename); // LordHavoc: added this @@ -1435,13 +1041,14 @@ void COM_WriteFile (char *filename, void *data, int len) handle = Sys_FileOpenWrite (name); if (handle == -1) { - Sys_Printf ("COM_WriteFile: failed on %s\n", name); - return; + Con_Printf ("COM_WriteFile: failed on %s\n", name); + return false; } - - Sys_Printf ("COM_WriteFile: %s\n", name); + + Con_DPrintf ("COM_WriteFile: %s\n", name); Sys_FileWrite (handle, data, len); Sys_FileClose (handle); + return true; } @@ -1458,7 +1065,7 @@ void COM_CopyFile (char *netpath, char *cachepath) int in, out; int remaining, count; char buf[4096]; - + remaining = Sys_FileOpenRead (netpath, &in); COM_CreatePath (cachepath); // create directories up to the cache file out = Sys_FileOpenWrite (cachepath); @@ -1550,7 +1157,7 @@ int COM_FindFile (char *filename, QFile **file, qboolean quiet, qboolean zip) int filenamelen; filenamelen = strlen (filename); - snprintf (gzfilename, sizeof (gzfilename), "%s.gz", filename); + sprintf (gzfilename, "%s.gz", filename); if (!file) Sys_Error ("COM_FindFile: file not set"); @@ -1559,11 +1166,6 @@ int COM_FindFile (char *filename, QFile **file, qboolean quiet, qboolean zip) // search through the path, one element at a time // search = com_searchpaths; - if (proghack) - { // gross hack to use quake 1 progs with quake 2 maps - if (!strcmp(filename, "progs.dat")) - search = search->next; - } for ( ; search ; search = search->next) { @@ -1585,13 +1187,6 @@ int COM_FindFile (char *filename, QFile **file, qboolean quiet, qboolean zip) } else { - // check a file in the directory tree -// if (!static_registered) -// { // if not a registered version, don't ever go beyond base -// if ( strchr (filename, '/') || strchr (filename,'\\')) -// continue; -// } - sprintf (netpath, "%s/%s",search->filename, filename); findtime = Sys_FileTime (netpath); @@ -1658,80 +1253,40 @@ Filename are reletive to the quake directory. Always appends a 0 byte. ============ */ -cache_user_t *loadcache; -byte *loadbuf; -int loadsize; -byte *COM_LoadFile (char *path, int usehunk, qboolean quiet) +qbyte *loadbuf; +int loadsize; +qbyte *COM_LoadFile (char *path, qboolean quiet) { - QFile *h; - byte *buf; - char base[1024]; - int len; + QFile *h; + qbyte *buf; + char base[1024]; + int len; buf = NULL; // quiet compiler warning + loadsize = 0; // look for it in the filesystem or pack files len = COM_FOpenFile (path, &h, quiet, true); if (!h) return NULL; - + + loadsize = len; + // extract the filename base name for hunk tag COM_FileBase (path, base); - - switch (usehunk) - { - case 1: - buf = Hunk_AllocName (len+1, va("%s (file)", path)); - if (!buf) - Sys_Error ("COM_LoadFile: not enough hunk space for %s (size %i)", path, len); - break; -// case 0: -// buf = Z_Malloc (len+1); -// if (!buf) -// Sys_Error ("COM_LoadFile: not enough zone space for %s (size %i)", path, len); -// break; -// case 3: -// buf = Cache_Alloc (loadcache, len+1, base); -// if (!buf) -// Sys_Error ("COM_LoadFile: not enough cache space for %s (size %i)", path, len); -// break; - case 5: - buf = qmalloc (len+1); - if (!buf) - Sys_Error ("COM_LoadFile: not enough available memory for %s (size %i)", path, len); - break; - default: - Sys_Error ("COM_LoadFile: bad usehunk"); - break; - } - ((byte *)buf)[len] = 0; + buf = Mem_Alloc(tempmempool, len+1); + if (!buf) + Sys_Error ("COM_LoadFile: not enough available memory for %s (size %i)", path, len); + + ((qbyte *)buf)[len] = 0; - Qread (h, buf, len); + Qread (h, buf, len); Qclose (h); return buf; } -byte *COM_LoadHunkFile (char *path, qboolean quiet) -{ - return COM_LoadFile (path, 1, quiet); -} - -// LordHavoc: returns malloc'd memory -byte *COM_LoadMallocFile (char *path, qboolean quiet) -{ - return COM_LoadFile (path, 5, quiet); -} - -/* -void COM_LoadCacheFile (char *path, struct cache_user_s *cu, qboolean quiet) -{ - loadcache = cu; - COM_LoadFile (path, 3, quiet); -} -*/ - /* ================= COM_LoadPackFile @@ -1744,66 +1299,54 @@ of the list so they override previous pack files. */ pack_t *COM_LoadPackFile (char *packfile) { - dpackheader_t header; - int i; - packfile_t *newfiles; - int numpackfiles; - pack_t *pack; - int packhandle; - // LordHavoc: changed from stack array to temporary malloc, allowing huge pack directories - dpackfile_t *info; - unsigned short crc; + dpackheader_t header; + int i; + int numpackfiles; + pack_t *pack; + int packhandle; + // LordHavoc: changed from stack array to temporary alloc, allowing huge pack directories + dpackfile_t *info; if (Sys_FileOpenRead (packfile, &packhandle) == -1) - { -// Con_Printf ("Couldn't open %s\n", packfile); return NULL; - } + Sys_FileRead (packhandle, (void *)&header, sizeof(header)); - if (header.id[0] != 'P' || header.id[1] != 'A' - || header.id[2] != 'C' || header.id[3] != 'K') + if (memcmp(header.id, "PACK", 4)) Sys_Error ("%s is not a packfile", packfile); header.dirofs = LittleLong (header.dirofs); header.dirlen = LittleLong (header.dirlen); + if (header.dirlen % sizeof(dpackfile_t)) + Sys_Error ("%s has an invalid directory size", packfile); + numpackfiles = header.dirlen / sizeof(dpackfile_t); if (numpackfiles > MAX_FILES_IN_PACK) Sys_Error ("%s has %i files", packfile, numpackfiles); - if (numpackfiles != PAK0_COUNT) - com_modified = true; // not the original file - - newfiles = Hunk_AllocName (numpackfiles * sizeof(packfile_t), "pack file-table"); + pack = Mem_Alloc(pak_mempool, sizeof (pack_t)); + strcpy (pack->filename, packfile); + pack->handle = packhandle; + pack->numfiles = numpackfiles; + pack->mempool = Mem_AllocPool(packfile); + pack->files = Mem_Alloc(pack->mempool, numpackfiles * sizeof(packfile_t)); + pack->next = packlist; + packlist = pack; - info = qmalloc(sizeof(*info)*MAX_FILES_IN_PACK); + info = Mem_Alloc(tempmempool, sizeof(*info) * numpackfiles); Sys_FileSeek (packhandle, header.dirofs); Sys_FileRead (packhandle, (void *)info, header.dirlen); -// crc the directory to check for modifications - CRC_Init (&crc); - // LordHavoc: speedup - CRC_ProcessBytes(&crc, (byte *)info, header.dirlen); -// for (i=0 ; ifiles[i].name, info[i].name); + pack->files[i].filepos = LittleLong(info[i].filepos); + pack->files[i].filelen = LittleLong(info[i].filelen); } - qfree(info); - pack = Hunk_AllocName (sizeof (pack_t), packfile); - strcpy (pack->filename, packfile); - pack->handle = packhandle; - pack->numfiles = numpackfiles; - pack->files = newfiles; - + Mem_Free(info); + Con_Printf ("Added packfile %s (%i files)\n", packfile, numpackfiles); return pack; } @@ -1814,45 +1357,46 @@ pack_t *COM_LoadPackFile (char *packfile) COM_AddGameDirectory Sets com_gamedir, adds the directory to the head of the path, -then loads and adds pak1.pak pak2.pak ... +then loads and adds pak1.pak pak2.pak ... ================ */ void COM_AddGameDirectory (char *dir) { - int i; - searchpath_t *search; - pack_t *pak; - char pakfile[MAX_OSPATH]; + stringlist_t *list, *current; + searchpath_t *search; + pack_t *pak; + char pakfile[MAX_OSPATH]; strcpy (com_gamedir, dir); // // add the directory to the search path // - search = Hunk_AllocName (sizeof(searchpath_t), "pack info"); + search = Mem_Alloc(pak_mempool, sizeof(searchpath_t)); strcpy (search->filename, dir); search->next = com_searchpaths; com_searchpaths = search; -// -// add any pak files in the format pak0.pak pak1.pak, ... -// - for (i=0 ; ; i++) + // add any paks in the directory + list = listdirectory(dir); + for (current = list;current;current = current->next) { - sprintf (pakfile, "%s/pak%i.pak", dir, i); - pak = COM_LoadPackFile (pakfile); - if (!pak) - break; - search = Hunk_AllocName (sizeof(searchpath_t), "pack info"); - search->pack = pak; - search->next = com_searchpaths; - com_searchpaths = search; + if (matchpattern(current->text, "*.pak")) + { + sprintf (pakfile, "%s/%s", dir, current->text); + pak = COM_LoadPackFile (pakfile); + if (pak) + { + search = Mem_Alloc(pak_mempool, sizeof(searchpath_t)); + search->pack = pak; + search->next = com_searchpaths; + com_searchpaths = search; + } + else + Con_Printf("unable to load pak \"%s\"\n", pakfile); + } } - -// -// add the contents of the parms.txt file to the end of the command line -// - + freedirectory(list); } /* @@ -1904,21 +1448,35 @@ void COM_InitFilesystem (void) com_cachedir[0] = 0; #endif -// // start up with GAMENAME by default (id1) -// COM_AddGameDirectory (va("%s/"GAMENAME, basedir) ); -#ifdef NEHAHRA - COM_AddGameDirectory (va("%s/nehahra", basedir) ); -#else - if (COM_CheckParm ("-rogue")) - COM_AddGameDirectory (va("%s/rogue", basedir) ); - if (COM_CheckParm ("-hipnotic")) + switch(gamemode) + { + case GAME_NORMAL: + break; + case GAME_HIPNOTIC: COM_AddGameDirectory (va("%s/hipnotic", basedir) ); - if (COM_CheckParm ("-nehahra")) + break; + case GAME_ROGUE: + COM_AddGameDirectory (va("%s/rogue", basedir) ); + break; + case GAME_NEHAHRA: COM_AddGameDirectory (va("%s/nehahra", basedir) ); -#endif + break; + case GAME_FIENDARENA: + COM_AddGameDirectory (va("%s/fiendarena", basedir) ); + break; + case GAME_ZYMOTIC: + COM_AddGameDirectory (va("%s/zymotic", basedir) ); + break; + case GAME_BLOODBATH: + COM_AddGameDirectory (va("%s/bb", basedir) ); + break; + default: + Sys_Error("COM_InitFilesystem: unknown gamemode %i\n", gamemode); + break; + } // // -game @@ -1944,8 +1502,8 @@ void COM_InitFilesystem (void) { if (!com_argv[i] || com_argv[i][0] == '+' || com_argv[i][0] == '-') break; - - search = Hunk_AllocName (sizeof(searchpath_t), "pack info"); + + search = Mem_Alloc(pak_mempool, sizeof(searchpath_t)); if ( !strcmp(COM_FileExtension(com_argv[i]), "pak") ) { search->pack = COM_LoadPackFile (com_argv[i]); @@ -1958,9 +1516,6 @@ void COM_InitFilesystem (void) com_searchpaths = search; } } - - if (COM_CheckParm ("-proghack")) - proghack = true; } int COM_FileExists(char *filename) @@ -1982,7 +1537,7 @@ int COM_FileExists(char *filename) } else { - sprintf (netpath, "%s/%s",search->filename, filename); + sprintf (netpath, "%s/%s",search->filename, filename); findtime = Sys_FileTime (netpath); if (findtime != -1) return true; @@ -2017,3 +1572,4 @@ void COM_ToUpperString(char *in, char *out) *out++ = *in++; } } +