X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=common.c;h=27112675c830b572a56a29fac0749925330a2000;hp=27fd8bf88828b88ff10c6ad59dcb771715df7293;hb=d57be67cb00229acb8564b92c8b7c58eeed8a0cb;hpb=9f6e4476fe8049342ac61c87ab7286912c1ff97c diff --git a/common.c b/common.c index 27fd8bf8..27112675 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,62 +19,49 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // common.c -- misc functions used in client and server +#include +#include +#ifdef WIN32 +#include +#else +#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 *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 proghack; -qboolean msg_suppress_1 = 0; +//int static_registered = 1; // only for startup check, then set + +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; - -#define CMDLINE_LENGTH 256 -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 -}; +char com_token[1024]; +int com_argc; +char **com_argv; + +// LordHavoc: made commandline 1024 characters instead of 256 +#define CMDLINE_LENGTH 1024 +char com_cmdline[CMDLINE_LENGTH]; + +int gamemode; +char *gamename; /* @@ -94,39 +81,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; -} - /* ============================================================================ @@ -139,7 +99,7 @@ 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; @@ -234,7 +194,7 @@ int Q_strcmp (char *s1, char *s2) s1++; s2++; } - + return -1; } @@ -251,14 +211,14 @@ int Q_strncmp (char *s1, char *s2, int count) s1++; s2++; } - + return -1; } */ int Q_strncasecmp (char *s1, char *s2, int n) { int c1, c2; - + while (1) { c1 = *s1++; @@ -266,7 +226,7 @@ int Q_strncasecmp (char *s1, char *s2, int n) if (!n--) return 0; // strings are equal until end point - + if (c1 != c2) { if (c1 >= 'a' && c1 <= 'z') @@ -281,7 +241,7 @@ int Q_strncasecmp (char *s1, char *s2, int n) // s1++; // s2++; } - + return -1; } @@ -295,7 +255,7 @@ int Q_atoi (char *str) int val; int sign; int c; - + if (*str == '-') { sign = -1; @@ -420,7 +380,7 @@ float Q_atof (char *str) val /= 10; total--; } - + return val*sign; } */ @@ -433,7 +393,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); @@ -452,10 +412,12 @@ 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) { @@ -469,10 +431,12 @@ 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) { @@ -481,8 +445,8 @@ float FloatSwap (float f) float f; byte b[4]; } dat1, dat2; - - + + dat1.f = f; dat2.b[0] = dat1.b[3]; dat2.b[1] = dat1.b[2]; @@ -491,10 +455,12 @@ float FloatSwap (float f) return dat2.f; } +#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) float FloatNoSwap (float f) { return f; } +#endif /* ============================================================================== @@ -538,7 +504,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"); @@ -552,7 +518,7 @@ void MSG_WriteShort (sizebuf_t *sb, int c) void MSG_WriteLong (sizebuf_t *sb, int c) { byte *buf; - + buf = SZ_GetSpace (sb, 4); buf[0] = c&0xff; buf[1] = (c>>8)&0xff; @@ -567,11 +533,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); } @@ -583,56 +549,44 @@ 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_WriteCoord (sizebuf_t *sb, float f) +void MSG_WriteFloatCoord (sizebuf_t *sb, float f) { - if (dpprotocol) - { - byte *buf; - int c = (int)f; - buf = SZ_GetSpace (sb, 3); - buf[0] = c & 0xff; - buf[1] = (c >> 8) & 0xff; - buf[2] = (c >> 16) & 0xff; - } - else - MSG_WriteShort (sb, (int)(f*8)); + MSG_WriteFloat(sb, f); } */ +// used by client void MSG_WriteCoord (sizebuf_t *sb, float f) { if (dpprotocol) MSG_WriteFloat(sb, f); - /* + else { - int i = (int) (f * 16.0f), j = 0, k, l; - // 1 sign bit, 5bit exponent, 10bit mantissa with implicit 1 - if (i < 0) - { - i = -i; - j = 0x8000; - } - - // LordHavoc: lets hope the compiler is good, if not it will still perform tolerably - for (k = 31,l = 0x80000000;!(i & l);k--,l >>= 1); - j |= k << 10 | ((i >> (k - 10)) & 0x3FF); - - MSG_WriteShort(sb, j); + if (f >= 0) + MSG_WriteShort (sb, (int)(f*8.0f + 0.5f)); + else + MSG_WriteShort (sb, (int)(f*8.0f - 0.5f)); } - */ - else - MSG_WriteShort (sb, (int)(f*8)); } void MSG_WritePreciseAngle (sizebuf_t *sb, float f) { - MSG_WriteShort (sb, (int) (f*65536.0f/360) & 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 toward zero, fixes crosshair problem void MSG_WriteAngle (sizebuf_t *sb, float f) { - MSG_WriteByte (sb, ((int)f*256/360) & 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); } // @@ -663,7 +617,7 @@ int MSG_ReadChar (void) c = (signed char)net_message.data[msg_readcount]; msg_readcount++; - + return c; } @@ -678,7 +632,7 @@ int MSG_ReadByte (void) msg_badread = true; return -1; } - + c = (unsigned char)net_message.data[msg_readcount]; msg_readcount++; @@ -689,7 +643,7 @@ int MSG_ReadByte (void) int MSG_ReadShort (void) { int c; - + if (msg_readcount+2 > net_message.cursize) { msg_badread = true; @@ -713,7 +667,7 @@ int MSG_ReadLong (void) 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) @@ -764,93 +718,22 @@ char *MSG_ReadString (void) return string; } +// used by server (always dpprotocol) +// moved to common.h as #define /* -float MSG_ReadAbsoluteCoord (void) +float MSG_ReadFloatCoord (void) { - if (dpprotocol) - { - int c; - - if (msg_readcount+3 > net_message.cursize) - { - msg_badread = true; - return 0; - } - - c = net_message.data[msg_readcount ]; - c |= net_message.data[msg_readcount+1] << 8; - c |= net_message.data[msg_readcount+2] << 16; - if (c & 0x800000) - c |= ~0xFFFFFF; // sign extend - - msg_readcount += 3; - - return (float) c * (1.0f / 16.0f); - } - else - { - int c; - - if (msg_readcount+2 > net_message.cursize) - { - msg_badread = true; - return 0; - } - - c = (short) (net_message.data[msg_readcount ] |= net_message.data[msg_readcount+1] << 8); - - msg_readcount += 2; - - return (float) c * (1.0f / 8.0f); -// return MSG_ReadShort() * (1.0f/8.0f); - } + return MSG_ReadFloat(); } */ +// used by client float MSG_ReadCoord (void) { if (dpprotocol) return MSG_ReadFloat(); - /* - { - int c, i; - - if (msg_readcount+2 > net_message.cursize) - { - msg_badread = true; - return 0; - } - - c = net_message.data[msg_readcount ] |= net_message.data[msg_readcount+1] << 8; - - msg_readcount += 2; - - if (!c) - return 0.0f; - // 1 sign bit, 5bit exponent, 10bit mantissa with implicit 1 - i = ((c & 0x03FF) | (0x0400)) << (((c & 0x7C00) >> 10) - 10); - if (c & 0x8000) - i = -i; - return i * (1.0f / 16.0f); - } - */ else - { - int c; - - if (msg_readcount+2 > net_message.cursize) - { - msg_badread = true; - return 0; - } - - c = (short) (net_message.data[msg_readcount ] | (net_message.data[msg_readcount+1] << 8)); - - msg_readcount += 2; - - return ((float) c * (1.0f / 8.0f)); -// return MSG_ReadShort() * (1.0f/8.0f); - } + return MSG_ReadShort() * (1.0f/8.0f); } /* @@ -863,21 +746,22 @@ 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; } @@ -885,9 +769,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; } @@ -899,18 +783,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: 512k (quake original default was 48k)"); - + Host_Error ("SZ_GetSpace: overflow without allowoverflow set - use -zone on the commandline for more zone memory, default: 128k (quake original default was 48k)"); + 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; @@ -949,7 +833,7 @@ COM_SkipPath char *COM_SkipPath (char *pathname) { char *last; - + last = pathname; while (*pathname) { @@ -965,11 +849,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 = in; + if ((*in == '/') || (*in == '\\') || (*in == ':')) + last = NULL; *out++ = *in++; - *out = 0; + } + if (last) + *last = 0; } /* @@ -1000,23 +893,29 @@ COM_FileBase */ void COM_FileBase (char *in, char *out) { - char *s, *s2; - - s = in + strlen(in) - 1; - - while (s != in && *s != '.') - s--; - - for (s2 = s ; *s2 && *s2 != '/' ; s2--) - ; - - if (s-s2 < 2) + 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 { - s--; - strncpy (out,s2+1, s-s2); - out[s-s2] = 0; + while (slash < dot) + *out++ = *slash++; + *out++ = 0; } } @@ -1159,16 +1058,11 @@ being registered. */ void COM_CheckRegistered (void) { - int h; - unsigned short check[128]; - int i; - Cvar_Set ("cmdline", com_cmdline); - COM_OpenFile("gfx/pop.lmp", &h, false); - static_registered = 0; +// static_registered = 0; - if (h == -1) + if (!Sys_FileTime("gfx/pop.lmp")) { if (com_modified) Con_Printf ("Playing shareware version, with modification.\nwarning: most mods require full quake data.\n"); @@ -1183,16 +1077,9 @@ void COM_CheckRegistered (void) return; } - Sys_FileRead (h, check, sizeof(check)); - COM_CloseFile (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; +// static_registered = 1; Con_Printf ("Playing registered version.\n"); } @@ -1254,42 +1141,64 @@ void COM_InitArgv (int argc, char **argv) largv[com_argc] = argvdummy; com_argv = largv; -#ifdef NEHAHRA - nehahra = true; - standard_quake = false; +#if 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")) - { - nehahra = true; - standard_quake = false; - } + 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) + { + 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; + default: + Sys_Error("COM_InitArgv: unknown gamemode %i\n", gamemode); + break; + } } +extern void Mathlib_Init(void); + /* ================ COM_Init ================ */ -void COM_Init (char *basedir) +void COM_Init (void) { -#ifndef WIN32 +#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) byte 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; @@ -1310,10 +1219,14 @@ void COM_Init (char *basedir) } #endif + pak_mempool = Mem_AllocPool("paks"); + Cvar_RegisterVariable (®istered); Cvar_RegisterVariable (&cmdline); Cmd_AddCommand ("path", COM_Path_f); + Mathlib_Init(); + COM_InitFilesystem (); COM_CheckRegistered (); } @@ -1369,16 +1282,18 @@ int com_filesize; typedef struct { - char name[MAX_QPATH]; - int filepos, filelen; + char name[MAX_QPATH]; + int filepos, filelen; } packfile_t; typedef struct pack_s { - char filename[MAX_OSPATH]; - int handle; - int numfiles; - packfile_t *files; + char filename[MAX_OSPATH]; + int handle; + int numfiles; + packfile_t *files; + mempool_t *mempool; + struct pack_s *next; } pack_t; // @@ -1386,27 +1301,31 @@ typedef struct pack_s // typedef struct { - char name[56]; - int filepos, filelen; + char name[56]; + int filepos, filelen; } dpackfile_t; typedef struct { - char id[4]; - int dirofs; - int dirlen; + char id[4]; + int dirofs; + int dirlen; } dpackheader_t; -// LordHavoc: was 2048, increased to 16384 and changed info[MAX_PACK_FILES] to a temporary malloc to avoid stack overflows -#define MAX_FILES_IN_PACK 16384 +// LordHavoc: was 2048, increased to 65536 and changed info[MAX_PACK_FILES] to a temporary alloc +#define MAX_FILES_IN_PACK 65536 -char com_cachedir[MAX_OSPATH]; -char com_gamedir[MAX_OSPATH]; +pack_t *packlist = NULL; + +#if CACHEENABLE +char com_cachedir[MAX_OSPATH]; +#endif +char com_gamedir[MAX_OSPATH]; typedef struct searchpath_s { - char filename[MAX_OSPATH]; - pack_t *pack; // only one of filename / pack will be used + char filename[MAX_OSPATH]; + pack_t *pack; // only one of filename / pack will be used struct searchpath_s *next; } searchpath_t; @@ -1421,7 +1340,7 @@ COM_Path_f void COM_Path_f (void) { searchpath_t *s; - + Con_Printf ("Current search path:\n"); for (s=com_searchpaths ; s ; s=s->next) { @@ -1434,6 +1353,30 @@ void COM_Path_f (void) } } +/* +============ +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; + } + } +} + + /* ============ COM_WriteFile @@ -1445,45 +1388,25 @@ 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; } - - Sys_Printf ("COM_WriteFile: %s\n", name); + + Con_Printf ("COM_WriteFile: %s\n", name); Sys_FileWrite (handle, data, len); Sys_FileClose (handle); } -/* -============ -COM_CreatePath - -Only used for CopyFile -============ -*/ -void COM_CreatePath (char *path) -{ - char *ofs; - - for (ofs = path+1 ; *ofs ; ofs++) - { - if (*ofs == '/') - { // create the directory - *ofs = 0; - Sys_mkdir (path); - *ofs = '/'; - } - } -} - - /* =========== COM_CopyFile @@ -1497,7 +1420,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); @@ -1517,6 +1440,55 @@ void COM_CopyFile (char *netpath, char *cachepath) 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])); + } + } + 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 @@ -1525,29 +1497,35 @@ Finds the file in the search path. Sets com_filesize and one of handle or file =========== */ -int COM_FindFile (char *filename, int *handle, FILE **file, qboolean quiet) +int COM_FindFile (char *filename, QFile **file, qboolean quiet, qboolean zip) { - searchpath_t *search; - char netpath[MAX_OSPATH]; - char cachepath[MAX_OSPATH]; - pack_t *pak; - int i; - int findtime, cachetime; - - if (file && handle) - Sys_Error ("COM_FindFile: both handle and file set"); - if (!file && !handle) - Sys_Error ("COM_FindFile: neither handle or file set"); + 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; - } +// 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) { @@ -1557,22 +1535,13 @@ int COM_FindFile (char *filename, int *handle, FILE **file, qboolean quiet) // look through all the pak file elements pak = search->pack; for (i=0 ; inumfiles ; i++) - if (!strcmp (pak->files[i].name, filename)) + 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, filename); - if (handle) - { - *handle = pak->handle; - Sys_FileSeek (pak->handle, pak->files[i].filepos); - } - else - { // open a new file on the pakfile - *file = fopen (pak->filename, "rb"); - if (*file) - fseek (*file, pak->files[i].filepos, SEEK_SET); - } - com_filesize = pak->files[i].filelen; + 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; } } @@ -1591,10 +1560,9 @@ int COM_FindFile (char *filename, int *handle, FILE **file, qboolean quiet) if (findtime == -1) continue; - // see if the file needs to be updated in the cache - if (!com_cachedir[0]) - strcpy (cachepath, netpath); - else +#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] != ':')) @@ -1611,17 +1579,11 @@ int COM_FindFile (char *filename, int *handle, FILE **file, qboolean quiet) COM_CopyFile (netpath, cachepath); strcpy (netpath, cachepath); } +#endif if (!quiet) Sys_Printf ("FindFile: %s\n",netpath); - com_filesize = Sys_FileOpenRead (netpath, &i); - if (handle) - *handle = i; - else - { - Sys_FileClose (i); - *file = fopen (netpath, "rb"); - } + *file = COM_OpenRead (netpath, -1, -1, zip); return com_filesize; } @@ -1630,58 +1592,23 @@ int COM_FindFile (char *filename, int *handle, FILE **file, qboolean quiet) if (!quiet) Sys_Printf ("FindFile: can't find %s\n", filename); - if (handle) - *handle = -1; - else - *file = NULL; + *file = NULL; com_filesize = -1; return -1; } -/* -=========== -COM_OpenFile - -filename never has a leading slash, but may contain directory walks -returns a handle and a length -it may actually be inside a pak file -=========== -*/ -int COM_OpenFile (char *filename, int *handle, qboolean quiet) -{ - return COM_FindFile (filename, handle, NULL, quiet); -} - /* =========== COM_FOpenFile -If the requested file is inside a packfile, a new FILE * will be opened +If the requested file is inside a packfile, a new QFile * will be opened into the file. =========== */ -int COM_FOpenFile (char *filename, FILE **file, qboolean quiet) -{ - return COM_FindFile (filename, NULL, file, quiet); -} - -/* -============ -COM_CloseFile - -If it is a pak file handle, don't really close it -============ -*/ -void COM_CloseFile (int h) +int COM_FOpenFile (char *filename, QFile **file, qboolean quiet, qboolean zip) { - searchpath_t *s; - - for (s = com_searchpaths ; s ; s=s->next) - if (s->pack && s->pack->handle == h) - return; - - Sys_FileClose (h); + return COM_FindFile (filename, file, quiet, zip); } @@ -1690,91 +1617,40 @@ void COM_CloseFile (int h) COM_LoadFile Filename are reletive to the quake directory. -Allways appends a 0 byte. +Always appends a 0 byte. ============ */ -cache_user_t *loadcache; -byte *loadbuf; -int loadsize; -byte *COM_LoadFile (char *path, int usehunk, qboolean quiet) +byte *loadbuf; +int loadsize; +byte *COM_LoadFile (char *path, qboolean quiet) { - int h; + QFile *h; byte *buf; - char base[32]; + char base[1024]; int len; buf = NULL; // quiet compiler warning + loadsize = 0; // look for it in the filesystem or pack files - len = COM_OpenFile (path, &h, quiet); - if (h == -1) + 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); - - if (usehunk == 1) - buf = Hunk_AllocName (len+1, base); - else if (usehunk == 2) - buf = Hunk_TempAlloc (len+1); - else if (usehunk == 0) - buf = Z_Malloc (len+1); - else if (usehunk == 3) - buf = Cache_Alloc (loadcache, len+1, base); - else if (usehunk == 4) - { - if (len+1 > loadsize) - buf = Hunk_TempAlloc (len+1); - else - buf = loadbuf; - } - else if (usehunk == 5) - buf = malloc (len+1); - else - Sys_Error ("COM_LoadFile: bad usehunk"); + buf = Mem_Alloc(tempmempool, len+1); if (!buf) - Sys_Error ("COM_LoadFile: not enough space for %s", path); - - ((byte *)buf)[len] = 0; - - Sys_FileRead (h, buf, len); - COM_CloseFile (h); - - return buf; -} - -byte *COM_LoadHunkFile (char *path, qboolean quiet) -{ - return COM_LoadFile (path, 1, quiet); -} - -byte *COM_LoadTempFile (char *path, qboolean quiet) -{ - return COM_LoadFile (path, 2, quiet); -} + Sys_Error ("COM_LoadFile: not enough available memory for %s (size %i)", path, len); -// LordHavoc: returns malloc'd memory -byte *COM_LoadMallocFile (char *path, qboolean quiet) -{ - return COM_LoadFile (path, 5, quiet); -} + ((byte *)buf)[len] = 0; -void COM_LoadCacheFile (char *path, struct cache_user_s *cu, qboolean quiet) -{ - loadcache = cu; - COM_LoadFile (path, 3, quiet); -} + Qread (h, buf, len); + Qclose (h); -// uses temp hunk if larger than bufsize -byte *COM_LoadStackFile (char *path, void *buffer, int bufsize, qboolean quiet) -{ - byte *buf; - - loadbuf = (byte *)buffer; - loadsize = bufsize; - buf = COM_LoadFile (path, 4, quiet); - return buf; } @@ -1790,66 +1666,56 @@ 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); + //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), "packfile"); + 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 = malloc(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); } - free(info); - pack = Hunk_Alloc (sizeof (pack_t)); - 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; } @@ -1860,7 +1726,7 @@ 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) @@ -1875,7 +1741,7 @@ void COM_AddGameDirectory (char *dir) // // add the directory to the search path // - search = Hunk_Alloc (sizeof(searchpath_t)); + search = Mem_Alloc(pak_mempool, sizeof(searchpath_t)); strcpy (search->filename, dir); search->next = com_searchpaths; com_searchpaths = search; @@ -1889,10 +1755,10 @@ void COM_AddGameDirectory (char *dir) pak = COM_LoadPackFile (pakfile); if (!pak) break; - search = Hunk_Alloc (sizeof(searchpath_t)); + search = Mem_Alloc(pak_mempool, sizeof(searchpath_t)); search->pack = pak; search->next = com_searchpaths; - com_searchpaths = search; + com_searchpaths = search; } // @@ -1930,6 +1796,7 @@ void COM_InitFilesystem (void) basedir[j-1] = 0; } +#if CACHEENABLE // // -cachedir // Overrides the system supplied cache directory (NULL or /qcache) @@ -1947,22 +1814,34 @@ void COM_InitFilesystem (void) 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) ); -#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; + default: + Sys_Error("COM_InitFilesystem: unknown gamemode %i\n", gamemode); + break; + } // // -game @@ -1977,7 +1856,7 @@ void COM_InitFilesystem (void) // // -path [] ... -// Fully specifies the exact serach path, overriding the generated one +// Fully specifies the exact search path, overriding the generated one // i = COM_CheckParm ("-path"); if (i) @@ -1988,8 +1867,8 @@ void COM_InitFilesystem (void) { if (!com_argv[i] || com_argv[i][0] == '+' || com_argv[i][0] == '-') break; - - search = Hunk_Alloc (sizeof(searchpath_t)); + + search = Mem_Alloc(pak_mempool, sizeof(searchpath_t)); if ( !strcmp(COM_FileExtension(com_argv[i]), "pak") ) { search->pack = COM_LoadPackFile (com_argv[i]); @@ -2003,8 +1882,8 @@ void COM_InitFilesystem (void) } } - if (COM_CheckParm ("-proghack")) - proghack = true; +// if (COM_CheckParm ("-proghack")) +// proghack = true; } int COM_FileExists(char *filename) @@ -2026,7 +1905,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; @@ -2036,3 +1915,28 @@ int COM_FileExists(char *filename) return false; } + +//====================================== +// LordHavoc: added these because they are useful + +void COM_ToLowerString(char *in, char *out) +{ + while (*in) + { + if (*in >= 'A' && *in <= 'Z') + *out++ = *in++ + 'a' - 'A'; + else + *out++ = *in++; + } +} + +void COM_ToUpperString(char *in, char *out) +{ + while (*in) + { + if (*in >= 'a' && *in <= 'z') + *out++ = *in++ + 'A' - 'a'; + else + *out++ = *in++; + } +}