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.
*/
// common.c -- misc functions used in client and server
+#include <stdlib.h>
+#include <fcntl.h>
+#ifdef WIN32
+#include <io.h>
+#else
+#include <unistd.h>
+#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;
/*
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;
-}
-
/*
============================================================================
void Q_memset (void *dest, int fill, int count)
{
int i;
-
+
if ( (((long)dest | count) & 3) == 0)
{
count >>= 2;
}
else
for (i=0 ; i<count ; i++)
- ((byte *)dest)[i] = fill;
+ ((qbyte *)dest)[i] = fill;
}
void Q_memcpy (void *dest, void *src, int count)
}
else
for (i=0 ; i<count ; i++)
- ((byte *)dest)[i] = ((byte *)src)[i];
+ ((qbyte *)dest)[i] = ((qbyte *)src)[i];
}
int Q_memcmp (void *m1, void *m2, int count)
while(count)
{
count--;
- if (((byte *)m1)[count] != ((byte *)m2)[count])
+ if (((qbyte *)m1)[count] != ((qbyte *)m2)[count])
return -1;
}
return 0;
s1++;
s2++;
}
-
+
return -1;
}
s1++;
s2++;
}
-
+
return -1;
}
*/
int Q_strncasecmp (char *s1, char *s2, int n)
{
int c1, c2;
-
+
while (1)
{
c1 = *s1++;
if (!n--)
return 0; // strings are equal until end point
-
+
if (c1 != c2)
{
if (c1 >= 'a' && c1 <= 'z')
// s1++;
// s2++;
}
-
+
return -1;
}
int val;
int sign;
int c;
-
+
if (*str == '-')
{
sign = -1;
val /= 10;
total--;
}
-
+
return val*sign;
}
*/
============================================================================
*/
-#ifndef WIN32
+#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)
short (*BigShort) (short l);
short (*LittleShort) (short l);
int (*BigLong) (int l);
short ShortSwap (short l)
{
- byte b1,b2;
+ qbyte b1,b2;
b1 = l&255;
b2 = (l>>8)&255;
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;
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];
return dat2.f;
}
+#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)
float FloatNoSwap (float f)
{
return f;
}
+#endif
/*
==============================================================================
void MSG_WriteChar (sizebuf_t *sb, int c)
{
- byte *buf;
+ qbyte *buf;
//#ifdef PARANOID
// if (c < -128 || c > 127)
void MSG_WriteByte (sizebuf_t *sb, int c)
{
- byte *buf;
+ qbyte *buf;
//#ifdef PARANOID
// if (c < 0 || c > 255)
void MSG_WriteShort (sizebuf_t *sb, int c)
{
- byte *buf;
-
+ qbyte *buf;
+
//#ifdef PARANOID
// if (c < ((short)0x8000) || c > (short)0x7fff)
// Sys_Error ("MSG_WriteShort: range error");
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;
float f;
int l;
} dat;
-
-
+
+
dat.f = f;
dat.l = LittleLong (dat.l);
-
+
SZ_Write (sb, &dat.l, 4);
}
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);
}
//
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;
}
{
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
{
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);
//===========================================================================
-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;
}
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;
}
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;
// 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
}
char *COM_SkipPath (char *pathname)
{
char *last;
-
+
last = pathname;
while (*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;
}
/*
*/
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");
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");
}
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);
-}
-
-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;
}
#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 ();
*/
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 memsearch (qbyte *start, int count, int search)
{
int i;
-
+
for (i=0 ; i<count ; i++)
if (start[i] == search)
return i;
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;
//
//
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
+
+pack_t *packlist = NULL;
-char com_cachedir[MAX_OSPATH];
-char com_gamedir[MAX_OSPATH];
+#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;
void COM_Path_f (void)
{
searchpath_t *s;
-
+
Con_Printf ("Current search path:\n");
for (s=com_searchpaths ; s ; s=s->next)
{
/*
============
-COM_WriteFile
+COM_CreatePath
-The filename will be prefixed by the current game directory
+LordHavoc: Previously only used for CopyFile, now also used for COM_WriteFile.
============
*/
-void COM_WriteFile (char *filename, void *data, int len)
+void COM_CreatePath (char *path)
{
- int handle;
- char name[MAX_OSPATH];
-
- sprintf (name, "%s/%s", com_gamedir, filename);
+ char *ofs, save;
- handle = Sys_FileOpenWrite (name);
- if (handle == -1)
+ for (ofs = path+1 ; *ofs ; ofs++)
{
- Sys_Printf ("COM_WriteFile: failed on %s\n", name);
- return;
+ if (*ofs == '/' || *ofs == '\\')
+ {
+ // create the directory
+ save = *ofs;
+ *ofs = 0;
+ Sys_mkdir (path);
+ *ofs = save;
+ }
}
-
- Sys_Printf ("COM_WriteFile: %s\n", name);
- Sys_FileWrite (handle, data, len);
- Sys_FileClose (handle);
}
/*
============
-COM_CreatePath
+COM_WriteFile
-Only used for CopyFile
+The filename will be prefixed by the current game directory
============
*/
-void COM_CreatePath (char *path)
+qboolean COM_WriteFile (char *filename, void *data, int len)
{
- char *ofs;
-
- for (ofs = path+1 ; *ofs ; ofs++)
+ 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)
{
- if (*ofs == '/')
- { // create the directory
- *ofs = 0;
- Sys_mkdir (path);
- *ofs = '/';
- }
+ Con_Printf ("COM_WriteFile: failed on %s\n", name);
+ return false;
}
+
+ Con_DPrintf ("COM_WriteFile: %s\n", name);
+ Sys_FileWrite (handle, data, len);
+ Sys_FileClose (handle);
+ return true;
}
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);
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
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)
{
// look through all the pak file elements
pak = search->pack;
for (i=0 ; i<pak->numfiles ; 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;
}
}
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] != ':'))
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;
}
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);
}
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)
-{
- int h;
- byte *buf;
- char base[1024];
- int len;
+qbyte *loadbuf;
+int loadsize;
+qbyte *COM_LoadFile (char *path, qboolean quiet)
+{
+ 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_OpenFile (path, &h, quiet);
- if (h == -1)
+ len = COM_FOpenFile (path, &h, quiet, true);
+ if (!h)
return NULL;
-
-// 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;
+ loadsize = len;
- Sys_FileRead (h, buf, len);
- COM_CloseFile (h);
+// extract the filename base name for hunk tag
+ COM_FileBase (path, base);
- return buf;
-}
+ buf = Mem_Alloc(tempmempool, len+1);
+ if (!buf)
+ Sys_Error ("COM_LoadFile: not enough available memory for %s (size %i)", path, len);
-byte *COM_LoadHunkFile (char *path, qboolean quiet)
-{
- return COM_LoadFile (path, 1, quiet);
-}
+ ((qbyte *)buf)[len] = 0;
-// LordHavoc: returns malloc'd memory
-byte *COM_LoadMallocFile (char *path, qboolean quiet)
-{
- return COM_LoadFile (path, 5, quiet);
-}
+ Qread (h, buf, len);
+ Qclose (h);
-void COM_LoadCacheFile (char *path, struct cache_user_s *cu, qboolean quiet)
-{
- loadcache = cu;
- COM_LoadFile (path, 3, quiet);
+ return buf;
}
/*
*/
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), "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 ; i<header.dirlen ; i++)
-// CRC_ProcessByte (&crc, ((byte *)info)[i]);
- if (crc != PAK0_CRC)
- com_modified = true;
-
// parse the directory
- for (i=0 ; i<numpackfiles ; i++)
+ for (i = 0;i < numpackfiles;i++)
{
- strcpy (newfiles[i].name, info[i].name);
- newfiles[i].filepos = LittleLong(info[i].filepos);
- newfiles[i].filelen = LittleLong(info[i].filelen);
+ strcpy (pack->files[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;
}
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];
+ //int i;
+ 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 paks in the directory
+ list = listdirectory(dir);
+ for (current = list;current;current = current->next)
+ {
+ 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);
+ }
+ }
+ freedirectory(list);
+
+ /*
//
// add any pak files in the format pak0.pak pak1.pak, ...
//
pak = COM_LoadPackFile (pakfile);
if (!pak)
break;
- search = Hunk_AllocName (sizeof(searchpath_t), "pack info");
+ search = Mem_Alloc(pak_mempool, sizeof(searchpath_t));
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
basedir[j-1] = 0;
}
+#if CACHEENABLE
//
// -cachedir <path>
// Overrides the system supplied cache directory (NULL or /qcache)
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;
+ case GAME_BLOODBATH:
+ COM_AddGameDirectory (va("%s/bb", basedir) );
+ break;
+ default:
+ Sys_Error("COM_InitFilesystem: unknown gamemode %i\n", gamemode);
+ break;
+ }
//
// -game <gamedir>
{
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]);
}
}
- if (COM_CheckParm ("-proghack"))
- proghack = true;
+// if (COM_CheckParm ("-proghack"))
+// proghack = true;
}
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;
projects / xonotic / darkplaces.git / blobdiff