X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=common.c;h=4ff60bb9d4c9fd97bb5ca0acd82315c5f84efe1a;hb=1ff5a7ef75a7cc595f527a10b766a6c6020ac4c0;hp=5c73c036c92cd4accd2f10aede6560ba84b40c4d;hpb=c5b3416006c0d50e7c2d5f0a267ab85a40315bee;p=xonotic%2Fdarkplaces.git diff --git a/common.c b/common.c index 5c73c036..4ff60bb9 100644 --- a/common.c +++ b/common.c @@ -21,367 +21,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#ifdef WIN32 -#include -#else +#ifndef WIN32 #include #endif #include "quakedef.h" -#define NUM_SAFE_ARGVS 7 - -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", "-window"}; - cvar_t registered = {0, "registered","0"}; cvar_t cmdline = {0, "cmdline","0"}; -qboolean com_modified; // set true if using non-id files - -//qboolean proghack; +extern qboolean fs_modified; // set true if using non-id files -//int static_registered = 1; // only for startup check, then set - -qboolean msg_suppress_1 = 0; - -void COM_InitFilesystem (void); - -char com_token[1024]; -int com_argc; -char **com_argv; +char com_token[1024]; +int com_argc; +const char **com_argv; // LordHavoc: made commandline 1024 characters instead of 256 #define CMDLINE_LENGTH 1024 -char com_cmdline[CMDLINE_LENGTH]; +char com_cmdline[CMDLINE_LENGTH]; int gamemode; char *gamename; +char *gamedirname; +char com_modname[MAX_OSPATH]; -/* - - -All of Quake's data access is through a hierchal file system, but the contents of the file system can be transparently merged from several sources. - -The "base directory" is the path to the directory holding the quake.exe and all game directories. The sys_* files pass this to host_init in quakeparms_t->basedir. This can be overridden with the "-basedir" command line parm to allow code debugging in a different directory. The base directory is -only used during filesystem initialization. - -The "game directory" is the first tree on the search path and directory that all generated files (savegames, screenshots, demos, config files) will be saved to. This can be overridden with the "-game" command line parameter. The game directory can never be changed while quake is executing. This is a precacution against having a malicious server instruct clients to write files over areas they shouldn't. - -The "cache directory" is only used during development to save network bandwidth, especially over ISDN / T1 lines. If there is a cache directory -specified, when a file is found by the normal search path, it will be mirrored -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. - -*/ - -//============================================================================ - - -/* -============================================================================ - - LIBRARY REPLACEMENT FUNCTIONS - -============================================================================ -*/ - -/* -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') - c1 -= ('a' - 'A'); - if (c2 >= 'a' && c2 <= 'z') - c2 -= ('a' - 'A'); - if (c1 != c2) - return -1; // strings not equal - } - if (!c1) - return 0; // strings are equal -// s1++; -// s2++; - } - - return -1; -} - -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; -} -*/ /* ============================================================================ @@ -402,7 +65,7 @@ float (*LittleFloat) (float l); short ShortSwap (short l) { - byte b1,b2; + qbyte b1,b2; b1 = l&255; b2 = (l>>8)&255; @@ -410,14 +73,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; @@ -427,20 +92,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]; @@ -449,10 +116,36 @@ float FloatSwap (float f) return dat2.f; } +#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) float FloatNoSwap (float f) { return f; } +#endif + + +// Extract integers from buffers + +unsigned int BuffBigLong (const qbyte *buffer) +{ + return (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3]; +} + +unsigned short BuffBigShort (const qbyte *buffer) +{ + return (buffer[0] << 8) | buffer[1]; +} + +unsigned int BuffLittleLong (const qbyte *buffer) +{ + return (buffer[3] << 24) | (buffer[2] << 16) | (buffer[1] << 8) | buffer[0]; +} + +unsigned short BuffLittleShort (const qbyte *buffer) +{ + return (buffer[1] << 8) | buffer[0]; +} + /* ============================================================================== @@ -469,12 +162,7 @@ Handles byte ordering and avoids alignment errors void MSG_WriteChar (sizebuf_t *sb, int c) { - byte *buf; - -//#ifdef PARANOID -// if (c < -128 || c > 127) -// Sys_Error ("MSG_WriteChar: range error"); -//#endif + qbyte *buf; buf = SZ_GetSpace (sb, 1); buf[0] = c; @@ -482,12 +170,7 @@ void MSG_WriteChar (sizebuf_t *sb, int c) void MSG_WriteByte (sizebuf_t *sb, int c) { - byte *buf; - -//#ifdef PARANOID -// if (c < 0 || c > 255) -// Sys_Error ("MSG_WriteByte: range error"); -//#endif + qbyte *buf; buf = SZ_GetSpace (sb, 1); buf[0] = c; @@ -495,12 +178,7 @@ void MSG_WriteByte (sizebuf_t *sb, int 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; @@ -509,8 +187,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; @@ -525,15 +203,15 @@ 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); } -void MSG_WriteString (sizebuf_t *sb, char *s) +void MSG_WriteString (sizebuf_t *sb, const char *s) { if (!s) SZ_Write (sb, "", 1); @@ -541,40 +219,37 @@ 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 PROTOCOL_DARKPLACES) +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); } // // reading functions // -int msg_readcount; -qboolean msg_badread; +int msg_readcount; +qboolean msg_badread; void MSG_BeginReading (void) { @@ -582,166 +257,128 @@ void MSG_BeginReading (void) msg_badread = false; } -/* -// returns -1 and sets msg_badread if no more characters are available -int MSG_ReadChar (void) +int MSG_ReadLittleShort (void) { - int c; - - // LordHavoc: minor optimization - if (msg_readcount >= net_message.cursize) -// if (msg_readcount+1 > net_message.cursize) + if (msg_readcount+2 > net_message.cursize) { msg_badread = true; return -1; } - - c = (signed char)net_message.data[msg_readcount]; - msg_readcount++; - - return c; + msg_readcount += 2; + return (short)(net_message.data[msg_readcount-2] | (net_message.data[msg_readcount-1]<<8)); } -int MSG_ReadByte (void) +int MSG_ReadBigShort (void) { - int c; - - // LordHavoc: minor optimization - if (msg_readcount >= net_message.cursize) -// if (msg_readcount+1 > net_message.cursize) + if (msg_readcount+2 > net_message.cursize) { msg_badread = true; return -1; } - - c = (unsigned char)net_message.data[msg_readcount]; - msg_readcount++; - - return c; + msg_readcount += 2; + return (short)((net_message.data[msg_readcount-2]<<8) + net_message.data[msg_readcount-1]); } -*/ -int MSG_ReadShort (void) +int MSG_ReadLittleLong (void) { - int c; - - if (msg_readcount+2 > net_message.cursize) + if (msg_readcount+4 > 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; + msg_readcount += 4; + return net_message.data[msg_readcount-4] | (net_message.data[msg_readcount-3]<<8) | (net_message.data[msg_readcount-2]<<16) | (net_message.data[msg_readcount-1]<<24); } -int MSG_ReadLong (void) +int MSG_ReadBigLong (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; + return (net_message.data[msg_readcount-4]<<24) + (net_message.data[msg_readcount-3]<<16) + (net_message.data[msg_readcount-2]<<8) + net_message.data[msg_readcount-1]; } -float MSG_ReadFloat (void) +float MSG_ReadLittleFloat (void) { union { - byte b[4]; - float f; - int l; + 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]; + if (msg_readcount+4 > net_message.cursize) + { + msg_badread = true; + return -1; + } msg_readcount += 4; - - dat.l = LittleLong (dat.l); + dat.l = net_message.data[msg_readcount-4] | (net_message.data[msg_readcount-3]<<8) | (net_message.data[msg_readcount-2]<<16) | (net_message.data[msg_readcount-1]<<24); + return dat.f; +} - return dat.f; +float MSG_ReadBigFloat (void) +{ + union + { + float f; + int l; + } dat; + if (msg_readcount+4 > net_message.cursize) + { + msg_badread = true; + return -1; + } + msg_readcount += 4; + dat.l = (net_message.data[msg_readcount-4]<<24) | (net_message.data[msg_readcount-3]<<16) | (net_message.data[msg_readcount-2]<<8) | net_message.data[msg_readcount-1]; + return dat.f; } char *MSG_ReadString (void) { - static char string[2048]; - int l,c; - - l = 0; - do - { - c = MSG_ReadChar (); - if (c == -1 || c == 0) - break; + static char string[2048]; + int l,c; + for (l = 0;l < (int) sizeof(string) - 1 && (c = MSG_ReadChar()) != -1 && c != 0;l++) 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) +int MSG_ReadBytes (int numbytes, unsigned char *out) { - return MSG_ReadFloat(); + int l, c; + for (l = 0;l < numbytes && (c = MSG_ReadChar()) != -1;l++) + out[l] = c; + return l; } -*/ -// used by client -float MSG_ReadCoord (void) +// used by server (always latest PROTOCOL_DARKPLACES) +float MSG_ReadDPCoord (void) { - if (dpprotocol) - return MSG_ReadFloat(); - else - return MSG_ReadShort() * (1.0f/8.0f); + return (signed short) MSG_ReadLittleShort(); } -/* +// used by client 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); + if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4) + return (signed short) MSG_ReadLittleShort(); + else if (cl.protocol == PROTOCOL_DARKPLACES1) + return MSG_ReadLittleFloat(); + else + return MSG_ReadLittleShort() * (1.0f/8.0f); } -*/ //=========================================================================== -void SZ_Alloc (sizebuf_t *buf, int startsize) +void SZ_Alloc (sizebuf_t *buf, int startsize, const 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; } @@ -749,9 +386,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; } @@ -762,43 +399,100 @@ void SZ_Clear (sizebuf_t *buf) void *SZ_GetSpace (sizebuf_t *buf, int length) { - void *data; - + 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\n"); + if (length > buf->maxsize) - Host_Error ("SZ_GetSpace: %i is > full buffer size", length); - + Host_Error ("SZ_GetSpace: %i is > full buffer size\n", length); + buf->overflowed = true; - Con_Printf ("SZ_GetSpace: overflow"); - SZ_Clear (buf); + Con_Printf ("SZ_GetSpace: overflow\n"); + SZ_Clear (buf); } data = buf->data + buf->cursize; buf->cursize += length; - + return data; } -void SZ_Write (sizebuf_t *buf, void *data, int length) +void SZ_Write (sizebuf_t *buf, const void *data, int length) { - memcpy (SZ_GetSpace(buf,length),data,length); + memcpy (SZ_GetSpace(buf,length),data,length); } -void SZ_Print (sizebuf_t *buf, char *data) +void SZ_Print (sizebuf_t *buf, const char *data) { - int len; - + int len; len = strlen(data)+1; // 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 +} + +static char *hexchar = "0123456789ABCDEF"; +void Com_HexDumpToConsole(const qbyte *data, int size) +{ + int i, j, n; + char text[1024]; + char *cur, *flushpointer; + const qbyte *d; + cur = text; + flushpointer = text + 512; + for (i = 0;i < size;) + { + n = 16; + if (n > size - i) + n = size - i; + d = data + i; + *cur++ = hexchar[(i >> 12) & 15]; + *cur++ = hexchar[(i >> 8) & 15]; + *cur++ = hexchar[(i >> 4) & 15]; + *cur++ = hexchar[(i >> 0) & 15]; + *cur++ = ':'; + for (j = 0;j < n;j++) + { + if (j & 1) + { + *cur++ = hexchar[(d[j] >> 4) & 15] | 0x80; + *cur++ = hexchar[(d[j] >> 0) & 15] | 0x80; + } + else + { + *cur++ = hexchar[(d[j] >> 4) & 15]; + *cur++ = hexchar[(d[j] >> 0) & 15]; + } + } + for (;j < 16;j++) + { + *cur++ = ' '; + *cur++ = ' '; + } + for (j = 0;j < n;j++) + *cur++ = (d[j] >= ' ' && d[j] <= 0x7E) ? d[j] : '.'; + for (;j < 16;j++) + *cur++ = ' '; + *cur++ = '\n'; + i += n; + if (cur >= flushpointer || i >= size) + { + *cur++ = 0; + Con_Printf("%s", text); + cur = text; + } + } +} + +void SZ_HexDumpToConsole(const sizebuf_t *buf) +{ + Com_HexDumpToConsole(buf->data, buf->cursize); } @@ -806,160 +500,58 @@ void SZ_Print (sizebuf_t *buf, char *data) /* -============ -COM_SkipPath -============ +============== +COM_ParseToken + +Parse a token out of a string +============== */ -char *COM_SkipPath (char *pathname) +int COM_ParseToken(const char **datapointer, int returnnewline) { - char *last; - - last = pathname; - while (*pathname) - { - if (*pathname=='/') - last = pathname+1; - pathname++; - } - return last; -} - -/* -============ -COM_StripExtension -============ -*/ -// LordHavoc: replacement for severely broken COM_StripExtension that was used in original quake. -void COM_StripExtension (char *in, char *out) -{ - char *last = NULL; - while (*in) - { - if (*in == '.') - last = in; - if ((*in == '/') || (*in == '\\') || (*in == ':')) - last = NULL; - *out++ = *in++; - } - if (last) - *last = 0; -} + int c; + int len; + const char *data = *datapointer; -/* -============ -COM_FileExtension -============ -*/ -char *COM_FileExtension (char *in) -{ - static char exten[8]; - int i; - - while (*in && *in != '.') - in++; - if (!*in) - return ""; - in++; - for (i=0 ; i<7 && *in ; i++,in++) - exten[i] = *in; - exten[i] = 0; - return exten; -} - -/* -============ -COM_FileBase -============ -*/ -void COM_FileBase (char *in, char *out) -{ - char *slash, *dot; - char *s; - - slash = in; - dot = NULL; - s = in; - while(*s) - { - if (*s == '/') - slash = s + 1; - if (*s == '.') - dot = s; - s++; - } - if (dot == NULL) - dot = s; - if (dot - slash < 2) - strcpy (out,"?model?"); - else - { - while (slash < dot) - *out++ = *slash++; - *out++ = 0; - } -} - - -/* -================== -COM_DefaultExtension -================== -*/ -void COM_DefaultExtension (char *path, char *extension) -{ - char *src; -// -// if path doesn't have a .EXT, append extension -// (extension should include the .) -// - src = path + strlen(path) - 1; + len = 0; + com_token[0] = 0; - while (*src != '/' && src != path) + if (!data) { - if (*src == '.') - return; // it has an extension - src--; + *datapointer = NULL; + return false; } - strcat (path, extension); -} - - -/* -============== -COM_Parse - -Parse a token out of a string -============== -*/ -char *COM_Parse (char *data) -{ - int c; - int len; - - len = 0; - com_token[0] = 0; - - if (!data) - return NULL; - // skip whitespace skipwhite: - while ( (c = *data) <= ' ') + while ((c = *data) <= ' ' && (c != '\n' || !returnnewline)) { if (c == 0) - return NULL; // end of file; + { + // end of file + *datapointer = NULL; + return false; + } data++; } - -// skip // comments - if (c=='/' && data[1] == '/') + + // check if it's a comment + if (c == '/') { - while (*data && *data != '\n') - data++; - goto skipwhite; + // skip // comments + if (data[1] == '/') + { + while (*data && *data != '\n') + data++; + goto skipwhite; + } + // skip /* comments + if (data[1] == '*') + { + while (*data && *data != '*' && data[1] != '/') + data++; + goto skipwhite; + } } - // handle quoted strings specially if (c == '\"') @@ -968,10 +560,11 @@ skipwhite: while (1) { c = *data++; - if (c=='\"' || !c) + if (c == '\"' || !c) { com_token[len] = 0; - return data; + *datapointer = data; + return true; } com_token[len] = c; len++; @@ -979,12 +572,13 @@ skipwhite: } // parse single characters - if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c==':') + if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';' || c == '\n') { com_token[len] = c; len++; com_token[len] = 0; - return data+1; + *datapointer = data+1; + return true; } // parse a regular word @@ -994,12 +588,13 @@ skipwhite: data++; len++; c = *data; - if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c==':') + if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';') break; } while (c>32); - + com_token[len] = 0; - return data; + *datapointer = data; + return true; } @@ -1011,10 +606,10 @@ Returns the position (1 to argc-1) in the program's argument list where the given parameter apears, or 0 if not present ================ */ -int COM_CheckParm (char *parm) +int COM_CheckParm (const char *parm) { - int i; - + int i; + for (i=1 ; inext) - { - if (s->pack) - { - Con_Printf ("%s (%i files)\n", s->pack->filename, s->pack->numfiles); - } - else - Con_Printf ("%s\n", s->filename); - } -} - -/* -============ -COM_CreatePath - -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 - save = *ofs; - *ofs = 0; - Sys_mkdir (path); - *ofs = save; - } - } + return s; } -/* -============ -COM_WriteFile - -The filename will be prefixed by the current game directory -============ -*/ -void COM_WriteFile (char *filename, void *data, int len) -{ - int handle; - char name[MAX_OSPATH]; - - sprintf (name, "%s/%s", com_gamedir, filename); - - // LordHavoc: added this - COM_CreatePath (name); // create directories up to the file - - handle = Sys_FileOpenWrite (name); - if (handle == -1) - { - Sys_Printf ("COM_WriteFile: failed on %s\n", name); - return; - } - - Con_Printf ("COM_WriteFile: %s\n", name); - Sys_FileWrite (handle, data, len); - Sys_FileClose (handle); -} - - -/* -=========== -COM_CopyFile +//====================================== +// LordHavoc: added these because they are useful -Copies a file over from the net to the local cache, creating any directories -needed. This is for the convenience of developers using ISDN from home. -=========== -*/ -void COM_CopyFile (char *netpath, char *cachepath) +void COM_ToLowerString(const char *in, char *out) { - 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); - - while (remaining) + while (*in) { - if (remaining < sizeof(buf)) - count = remaining; + if (*in >= 'A' && *in <= 'Z') + *out++ = *in++ + 'a' - 'A'; else - count = sizeof(buf); - Sys_FileRead (in, buf, count); - Sys_FileWrite (out, buf, count); - remaining -= count; - } - - Sys_FileClose (in); - Sys_FileClose (out); -} - -/* -=========== -COM_OpenRead -=========== -*/ -QFile * COM_OpenRead (const char *path, int offs, int len, qboolean zip) -{ - int fd = open (path, O_RDONLY); - unsigned char id[2]; - unsigned char len_bytes[4]; - - if (fd == -1) - { - Sys_Error ("Couldn't open %s", path); - return 0; - } - if (offs < 0 || len < 0) - { - // normal file - offs = 0; - len = lseek (fd, 0, SEEK_END); - lseek (fd, 0, SEEK_SET); - } - lseek (fd, offs, SEEK_SET); - if (zip) - { - read (fd, id, 2); - if (id[0] == 0x1f && id[1] == 0x8b) - { - lseek (fd, offs + len - 4, SEEK_SET); - read (fd, len_bytes, 4); - len = ((len_bytes[3] << 24) - | (len_bytes[2] << 16) - | (len_bytes[1] << 8) - | (len_bytes[0])); - } + *out++ = *in++; } - lseek (fd, offs, SEEK_SET); - com_filesize = len; - -#ifdef WIN32 - setmode (fd, O_BINARY); -#endif - if (zip) - return Qdopen (fd, "rbz"); - else - return Qdopen (fd, "rb"); } -/* -=========== -COM_FindFile - -Finds the file in the search path. -Sets com_filesize and one of handle or file -=========== -*/ -int COM_FindFile (char *filename, QFile **file, qboolean quiet, qboolean zip) +void COM_ToUpperString(const char *in, char *out) { - searchpath_t *search; - char netpath[MAX_OSPATH]; -#if CACHEENABLE - char cachepath[MAX_OSPATH]; - int cachetime; -#endif - pack_t *pak; - int i; - int findtime; - char gzfilename[MAX_OSPATH]; - int filenamelen; - - filenamelen = strlen (filename); - sprintf (gzfilename, "%s.gz", filename); - - if (!file) - Sys_Error ("COM_FindFile: file not set"); - -// -// 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) + while (*in) { - // is the element a pak file? - if (search->pack) - { - // look through all the pak file elements - pak = search->pack; - for (i=0 ; inumfiles ; i++) - if (!strcmp (pak->files[i].name, filename) - || !strcmp (pak->files[i].name, gzfilename)) - { // found it! - if (!quiet) - Sys_Printf ("PackFile: %s : %s\n",pak->filename, pak->files[i].name); - // open a new file on the pakfile - *file = COM_OpenRead (pak->filename, pak->files[i].filepos, pak->files[i].filelen, zip); - return com_filesize; - } - } + if (*in >= 'a' && *in <= 'z') + *out++ = *in++ + 'A' - 'a'; 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); - if (findtime == -1) - continue; - -#if CACHEENABLE - // see if the file needs to be updated in the cache - if (com_cachedir[0]) - { -#if defined(_WIN32) - if ((strlen(netpath) < 2) || (netpath[1] != ':')) - sprintf (cachepath,"%s%s", com_cachedir, netpath); - else - sprintf (cachepath,"%s%s", com_cachedir, netpath+2); -#else - sprintf (cachepath,"%s%s", com_cachedir, netpath); -#endif - - cachetime = Sys_FileTime (cachepath); - - if (cachetime < findtime) - COM_CopyFile (netpath, cachepath); - strcpy (netpath, cachepath); - } -#endif - - if (!quiet) - Sys_Printf ("FindFile: %s\n",netpath); - *file = COM_OpenRead (netpath, -1, -1, zip); - return com_filesize; - } - - } - - if (!quiet) - Sys_Printf ("FindFile: can't find %s\n", filename); - - *file = NULL; - com_filesize = -1; - return -1; -} - - -/* -=========== -COM_FOpenFile - -If the requested file is inside a packfile, a new QFile * will be opened -into the file. -=========== -*/ -int COM_FOpenFile (char *filename, QFile **file, qboolean quiet, qboolean zip) -{ - return COM_FindFile (filename, file, quiet, zip); -} - - -/* -============ -COM_LoadFile - -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) -{ - QFile *h; - byte *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; + *out++ = *in++; } - - ((byte *)buf)[len] = 0; - - 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) +int COM_StringBeginsWith(const char *s, const char *match) { - return COM_LoadFile (path, 5, quiet); + for (;*s && *match;s++, match++) + if (*s != *match) + return false; + return true; } -/* -void COM_LoadCacheFile (char *path, struct cache_user_s *cu, qboolean quiet) +// written by Elric, thanks Elric! +char *SearchInfostring(const char *infostring, const char *key) { - loadcache = cu; - COM_LoadFile (path, 3, quiet); -} -*/ - -/* -================= -COM_LoadPackFile - -Takes an explicit (not game tree related) path to a pak file. + static char value [256]; + char crt_key [256]; + size_t value_ind, key_ind; + char c; -Loads the header and directory, adding the files at the beginning -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; - - if (Sys_FileOpenRead (packfile, &packhandle) == -1) - { -// Con_Printf ("Couldn't open %s\n", packfile); + if (*infostring++ != '\\') 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') - Sys_Error ("%s is not a packfile", packfile); - header.dirofs = LittleLong (header.dirofs); - header.dirlen = LittleLong (header.dirlen); - - numpackfiles = header.dirlen / sizeof(dpackfile_t); - - if (numpackfiles > MAX_FILES_IN_PACK) - Sys_Error ("%s has %i files", packfile, numpackfiles); - - newfiles = Hunk_AllocName (numpackfiles * sizeof(packfile_t), "pack file-table"); - info = qmalloc(sizeof(*info)*MAX_FILES_IN_PACK); - Sys_FileSeek (packhandle, header.dirofs); - Sys_FileRead (packhandle, (void *)info, header.dirlen); - -// parse the directory - for (i=0 ; ifilename, packfile); - pack->handle = packhandle; - pack->numfiles = numpackfiles; - pack->files = newfiles; - - Con_Printf ("Added packfile %s (%i files)\n", packfile, numpackfiles); - return pack; -} - - -/* -================ -COM_AddGameDirectory - -Sets com_gamedir, adds the directory to the head of the path, -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]; - - strcpy (com_gamedir, dir); + key_ind = 0; -// -// add the directory to the search path -// - search = Hunk_AllocName (sizeof(searchpath_t), "pack info"); - 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++) - { - 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; - } - -// -// add the contents of the parms.txt file to the end of the command line -// - -} - -/* -================ -COM_InitFilesystem -================ -*/ -void COM_InitFilesystem (void) -{ - int i, j; - char basedir[MAX_OSPATH]; - searchpath_t *search; - -// -// -basedir -// Overrides the system supplied base directory (under GAMENAME) -// - i = COM_CheckParm ("-basedir"); - if (i && i < com_argc-1) - strcpy (basedir, com_argv[i+1]); - else - strcpy (basedir, host_parms.basedir); - - j = strlen (basedir); - - if (j > 0) - { - if ((basedir[j-1] == '\\') || (basedir[j-1] == '/')) - basedir[j-1] = 0; - } - -#if CACHEENABLE -// -// -cachedir -// Overrides the system supplied cache directory (NULL or /qcache) -// -cachedir - will disable caching. -// - i = COM_CheckParm ("-cachedir"); - if (i && i < com_argc-1) - { - if (com_argv[i+1][0] == '-') - com_cachedir[0] = 0; - else - strcpy (com_cachedir, com_argv[i+1]); - } - else if (host_parms.cachedir) - strcpy (com_cachedir, host_parms.cachedir); - else - com_cachedir[0] = 0; -#endif - -// start up with GAMENAME by default (id1) - COM_AddGameDirectory (va("%s/"GAMENAME, basedir) ); - - switch(gamemode) - { - case GAME_NORMAL: - break; - case GAME_HIPNOTIC: - COM_AddGameDirectory (va("%s/hipnotic", basedir) ); - break; - case GAME_ROGUE: - COM_AddGameDirectory (va("%s/rogue", basedir) ); - break; - case GAME_NEHAHRA: - COM_AddGameDirectory (va("%s/nehahra", basedir) ); - break; - case GAME_FIENDARENA: - COM_AddGameDirectory (va("%s/fiendarena", basedir) ); - break; - case GAME_ZYMOTIC: - COM_AddGameDirectory (va("%s/zymotic", basedir) ); - break; - default: - Sys_Error("COM_InitFilesystem: unknown gamemode %i\n", gamemode); - break; - } - -// -// -game -// Adds basedir/gamedir as an override game -// - i = COM_CheckParm ("-game"); - if (i && i < com_argc-1) - { - com_modified = true; - COM_AddGameDirectory (va("%s/%s", basedir, com_argv[i+1])); - } - -// -// -path [] ... -// Fully specifies the exact search path, overriding the generated one -// - i = COM_CheckParm ("-path"); - if (i) - { - com_modified = true; - com_searchpaths = NULL; - while (++i < com_argc) + // Get the key name + for (;;) { - if (!com_argv[i] || com_argv[i][0] == '+' || com_argv[i][0] == '-') - break; + c = *infostring++; - search = Hunk_AllocName (sizeof(searchpath_t), "pack info"); - if ( !strcmp(COM_FileExtension(com_argv[i]), "pak") ) + if (c == '\0') + return NULL; + if (c == '\\' || key_ind == sizeof (crt_key) - 1) { - search->pack = COM_LoadPackFile (com_argv[i]); - if (!search->pack) - Sys_Error ("Couldn't load packfile: %s", com_argv[i]); + crt_key[key_ind] = '\0'; + break; } - else - strcpy (search->filename, com_argv[i]); - search->next = com_searchpaths; - com_searchpaths = search; - } - } -// if (COM_CheckParm ("-proghack")) -// proghack = true; -} - -int COM_FileExists(char *filename) -{ - searchpath_t *search; - char netpath[MAX_OSPATH]; - pack_t *pak; - int i; - int findtime; - - for (search = com_searchpaths;search;search = search->next) - { - if (search->pack) - { - pak = search->pack; - for (i = 0;i < pak->numfiles;i++) - if (!strcmp (pak->files[i].name, filename)) - return true; + crt_key[key_ind++] = c; } - else + + // If it's the key we are looking for, save it in "value" + if (!strcmp(crt_key, key)) { - sprintf (netpath, "%s/%s",search->filename, filename); - findtime = Sys_FileTime (netpath); - if (findtime != -1) - return true; - } - } + for (;;) + { + c = *infostring++; - return false; -} + if (c == '\0' || c == '\\' || value_ind == sizeof (value) - 1) + { + value[value_ind] = '\0'; + return value; + } + value[value_ind++] = c; + } + } -//====================================== -// LordHavoc: added these because they are useful + // Else, skip the value + for (;;) + { + c = *infostring++; -void COM_ToLowerString(char *in, char *out) -{ - while (*in) - { - if (*in >= 'A' && *in <= 'Z') - *out++ = *in++ + 'a' - 'A'; - else - *out++ = *in++; + if (c == '\0') + return NULL; + if (c == '\\') + break; + } } } -void COM_ToUpperString(char *in, char *out) -{ - while (*in) - { - if (*in >= 'a' && *in <= 'z') - *out++ = *in++ + 'A' - 'a'; - else - *out++ = *in++; - } -}