X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=common.c;h=0a90829e57adae948e239c9e666b83e63dc01f03;hp=36d2920ee3edd6a624aa76a4a70ff30d5088d0cc;hb=4cadf0af49c8266d57171fa0fe7415f388d8a462;hpb=5d6fabe47d4cce45d956fdfa4d4dba30e2f6ea06

diff --git a/common.c b/common.c
index 36d2920e..0a90829e 100644
--- a/common.c
+++ b/common.c
@@ -21,369 +21,33 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdlib.h>
 #include <fcntl.h>
-#ifdef WIN32
-#include <io.h>
-#else
+#ifndef WIN32
 #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 *safeargvs[NUM_SAFE_ARGVS] =
-	{"-stdvid", "-nolan", "-nosound", "-nocdaudio", "-nojoy", "-nomouse", "-window"};
-
 cvar_t registered = {0, "registered","0"};
 cvar_t cmdline = {0, "cmdline","0"};
 
-mempool_t *pak_mempool;
-
-qboolean com_modified;   // set true if using non-id files
-
-//qboolean proghack;
-
-//int static_registered = 1;  // only for startup check, then set
-
-qboolean msg_suppress_1 = 0;
-
-void COM_InitFilesystem (void);
+extern qboolean fs_modified;   // set true if using non-id files
 
 char com_token[1024];
 int com_argc;
-char **com_argv;
+const char **com_argv;
 
 // LordHavoc: made commandline 1024 characters instead of 256
 #define CMDLINE_LENGTH	1024
 char com_cmdline[CMDLINE_LENGTH];
 
-int gamemode;
-char *gamename;
-
-/*
-
-
-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<count ; i++)
-			((int *)dest)[i] = fill;
-	}
-	else
-		for (i=0 ; i<count ; i++)
-			((qbyte *)dest)[i] = fill;
-}
-
-void Q_memcpy (void *dest, void *src, int count)
-{
-	int             i;
-	
-	if (( ( (long)dest | (long)src | count) & 3) == 0 )
-	{
-		count>>=2;
-		for (i=0 ; i<count ; i++)
-			((int *)dest)[i] = ((int *)src)[i];
-	}
-	else
-		for (i=0 ; i<count ; i++)
-			((qbyte *)dest)[i] = ((qbyte *)src)[i];
-}
-
-int Q_memcmp (void *m1, void *m2, int count)
-{
-	while(count)
-	{
-		count--;
-		if (((qbyte *)m1)[count] != ((qbyte *)m2)[count])
-			return -1;
-	}
-	return 0;
-}
-
-void Q_strcpy (char *dest, char *src)
-{
-	while (*src)
-	{
-		*dest++ = *src++;
-	}
-	*dest++ = 0;
-}
-
-void Q_strncpy (char *dest, char *src, int count)
-{
-	while (*src && count--)
-	{
-		*dest++ = *src++;
-	}
-	if (count)
-		*dest++ = 0;
-}
-
-int Q_strlen (char *str)
-{
-	int             count;
-	
-	count = 0;
-	while (str[count])
-		count++;
-
-	return count;
-}
-
-char *Q_strrchr(char *s, char c)
-{
-    int len = Q_strlen(s);
-    s += len;
-    while (len--)
-	if (*--s == c) return s;
-    return 0;
-}
-
-void Q_strcat (char *dest, char *src)
-{
-	dest += Q_strlen(dest);
-	Q_strcpy (dest, src);
-}
-
-int Q_strcmp (char *s1, char *s2)
-{
-	while (1)
-	{
-		if (*s1 != *s2)
-			return -1;              // strings not equal    
-		if (!*s1)
-			return 0;               // strings are equal
-		s1++;
-		s2++;
-	}
-
-	return -1;
-}
-
-int Q_strncmp (char *s1, char *s2, int count)
-{
-	while (1)
-	{
-		if (!count--)
-			return 0;
-		if (*s1 != *s2)
-			return -1;              // strings not equal    
-		if (!*s1)
-			return 0;               // strings are equal
-		s1++;
-		s2++;
-	}
-
-	return -1;
-}
-*/
-int Q_strncasecmp (char *s1, char *s2, int n)
-{
-	int             c1, c2;
-
-	while (1)
-	{
-		c1 = *s1++;
-		c2 = *s2++;
-
-		if (!n--)
-			return 0;               // strings are equal until end point
-
-		if (c1 != c2)
-		{
-			if (c1 >= '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--;
-	}
+gamemode_t gamemode;
+const char *gamename;
+const char *gamedirname1;
+const char *gamedirname2;
+const char *gamescreenshotname;
+const char *gameuserdirname;
+char com_modname[MAX_OSPATH] = "";
 
-	return val*sign;
-}
-*/
 
 /*
 ============================================================================
@@ -393,15 +57,6 @@ float Q_atof (char *str)
 ============================================================================
 */
 
-#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)
-short   (*BigShort) (short l);
-short   (*LittleShort) (short l);
-int     (*BigLong) (int l);
-int     (*LittleLong) (int l);
-float   (*BigFloat) (float l);
-float   (*LittleFloat) (float l);
-#endif
-
 short   ShortSwap (short l)
 {
 	qbyte    b1,b2;
@@ -412,13 +67,6 @@ 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)
 {
 	qbyte    b1,b2,b3,b4;
@@ -431,13 +79,6 @@ 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
@@ -455,12 +96,89 @@ float FloatSwap (float f)
 	return dat2.f;
 }
 
-#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)
-float FloatNoSwap (float f)
+
+// Extract integers from buffers
+
+unsigned int BuffBigLong (const qbyte *buffer)
 {
-	return f;
+	return (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3];
 }
-#endif
+
+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];
+}
+
+
+/*
+============================================================================
+
+					CRC FUNCTIONS
+
+============================================================================
+*/
+
+// this is a 16 bit, non-reflected CRC using the polynomial 0x1021
+// and the initial and final xor values shown below...  in other words, the
+// CCITT standard CRC used by XMODEM
+
+#define CRC_INIT_VALUE	0xffff
+#define CRC_XOR_VALUE	0x0000
+
+static unsigned short crctable[256] =
+{
+	0x0000,	0x1021,	0x2042,	0x3063,	0x4084,	0x50a5,	0x60c6,	0x70e7,
+	0x8108,	0x9129,	0xa14a,	0xb16b,	0xc18c,	0xd1ad,	0xe1ce,	0xf1ef,
+	0x1231,	0x0210,	0x3273,	0x2252,	0x52b5,	0x4294,	0x72f7,	0x62d6,
+	0x9339,	0x8318,	0xb37b,	0xa35a,	0xd3bd,	0xc39c,	0xf3ff,	0xe3de,
+	0x2462,	0x3443,	0x0420,	0x1401,	0x64e6,	0x74c7,	0x44a4,	0x5485,
+	0xa56a,	0xb54b,	0x8528,	0x9509,	0xe5ee,	0xf5cf,	0xc5ac,	0xd58d,
+	0x3653,	0x2672,	0x1611,	0x0630,	0x76d7,	0x66f6,	0x5695,	0x46b4,
+	0xb75b,	0xa77a,	0x9719,	0x8738,	0xf7df,	0xe7fe,	0xd79d,	0xc7bc,
+	0x48c4,	0x58e5,	0x6886,	0x78a7,	0x0840,	0x1861,	0x2802,	0x3823,
+	0xc9cc,	0xd9ed,	0xe98e,	0xf9af,	0x8948,	0x9969,	0xa90a,	0xb92b,
+	0x5af5,	0x4ad4,	0x7ab7,	0x6a96,	0x1a71,	0x0a50,	0x3a33,	0x2a12,
+	0xdbfd,	0xcbdc,	0xfbbf,	0xeb9e,	0x9b79,	0x8b58,	0xbb3b,	0xab1a,
+	0x6ca6,	0x7c87,	0x4ce4,	0x5cc5,	0x2c22,	0x3c03,	0x0c60,	0x1c41,
+	0xedae,	0xfd8f,	0xcdec,	0xddcd,	0xad2a,	0xbd0b,	0x8d68,	0x9d49,
+	0x7e97,	0x6eb6,	0x5ed5,	0x4ef4,	0x3e13,	0x2e32,	0x1e51,	0x0e70,
+	0xff9f,	0xefbe,	0xdfdd,	0xcffc,	0xbf1b,	0xaf3a,	0x9f59,	0x8f78,
+	0x9188,	0x81a9,	0xb1ca,	0xa1eb,	0xd10c,	0xc12d,	0xf14e,	0xe16f,
+	0x1080,	0x00a1,	0x30c2,	0x20e3,	0x5004,	0x4025,	0x7046,	0x6067,
+	0x83b9,	0x9398,	0xa3fb,	0xb3da,	0xc33d,	0xd31c,	0xe37f,	0xf35e,
+	0x02b1,	0x1290,	0x22f3,	0x32d2,	0x4235,	0x5214,	0x6277,	0x7256,
+	0xb5ea,	0xa5cb,	0x95a8,	0x8589,	0xf56e,	0xe54f,	0xd52c,	0xc50d,
+	0x34e2,	0x24c3,	0x14a0,	0x0481,	0x7466,	0x6447,	0x5424,	0x4405,
+	0xa7db,	0xb7fa,	0x8799,	0x97b8,	0xe75f,	0xf77e,	0xc71d,	0xd73c,
+	0x26d3,	0x36f2,	0x0691,	0x16b0,	0x6657,	0x7676,	0x4615,	0x5634,
+	0xd94c,	0xc96d,	0xf90e,	0xe92f,	0x99c8,	0x89e9,	0xb98a,	0xa9ab,
+	0x5844,	0x4865,	0x7806,	0x6827,	0x18c0,	0x08e1,	0x3882,	0x28a3,
+	0xcb7d,	0xdb5c,	0xeb3f,	0xfb1e,	0x8bf9,	0x9bd8,	0xabbb,	0xbb9a,
+	0x4a75,	0x5a54,	0x6a37,	0x7a16,	0x0af1,	0x1ad0,	0x2ab3,	0x3a92,
+	0xfd2e,	0xed0f,	0xdd6c,	0xcd4d,	0xbdaa,	0xad8b,	0x9de8,	0x8dc9,
+	0x7c26,	0x6c07,	0x5c64,	0x4c45,	0x3ca2,	0x2c83,	0x1ce0,	0x0cc1,
+	0xef1f,	0xff3e,	0xcf5d,	0xdf7c,	0xaf9b,	0xbfba,	0x8fd9,	0x9ff8,
+	0x6e17,	0x7e36,	0x4e55,	0x5e74,	0x2e93,	0x3eb2,	0x0ed1,	0x1ef0
+};
+
+unsigned short CRC_Block(const qbyte *data, size_t size)
+{
+	unsigned short crc = CRC_INIT_VALUE;
+	while (size--)
+		crc = (crc << 8) ^ crctable[(crc >> 8) ^ (*data++)];
+	return crc ^ CRC_XOR_VALUE;
+}
+
 
 /*
 ==============================================================================
@@ -478,11 +196,6 @@ Handles byte ordering and avoids alignment errors
 void MSG_WriteChar (sizebuf_t *sb, int c)
 {
 	qbyte    *buf;
-	
-//#ifdef PARANOID
-//	if (c < -128 || c > 127)
-//		Sys_Error ("MSG_WriteChar: range error");
-//#endif
 
 	buf = SZ_GetSpace (sb, 1);
 	buf[0] = c;
@@ -491,11 +204,6 @@ void MSG_WriteChar (sizebuf_t *sb, int c)
 void MSG_WriteByte (sizebuf_t *sb, int c)
 {
 	qbyte    *buf;
-	
-//#ifdef PARANOID
-//	if (c < 0 || c > 255)
-//		Sys_Error ("MSG_WriteByte: range error");
-//#endif
 
 	buf = SZ_GetSpace (sb, 1);
 	buf[0] = c;
@@ -505,11 +213,6 @@ void MSG_WriteShort (sizebuf_t *sb, int c)
 {
 	qbyte    *buf;
 
-//#ifdef PARANOID
-//	if (c < ((short)0x8000) || c > (short)0x7fff)
-//		Sys_Error ("MSG_WriteShort: range error");
-//#endif
-
 	buf = SZ_GetSpace (sb, 2);
 	buf[0] = c&0xff;
 	buf[1] = c>>8;
@@ -541,45 +244,95 @@ void MSG_WriteFloat (sizebuf_t *sb, float f)
 	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);
 	else
-		SZ_Write (sb, s, strlen(s)+1);
+		SZ_Write (sb, s, (int)strlen(s)+1);
+}
+
+void MSG_WriteUnterminatedString (sizebuf_t *sb, const char *s)
+{
+	if (s)
+		SZ_Write (sb, s, (int)strlen(s));
 }
 
-// used by server (always latest dpprotocol)
-void MSG_WriteDPCoord (sizebuf_t *sb, float f)
+void MSG_WriteCoord13i (sizebuf_t *sb, float f)
 {
 	if (f >= 0)
-		MSG_WriteShort (sb, (int)(f + 0.5f));
+		MSG_WriteShort (sb, (int)(f * 8.0 + 0.5));
 	else
-		MSG_WriteShort (sb, (int)(f - 0.5f));
+		MSG_WriteShort (sb, (int)(f * 8.0 - 0.5));
 }
 
-void MSG_WritePreciseAngle (sizebuf_t *sb, float f)
+void MSG_WriteCoord16i (sizebuf_t *sb, float f)
 {
 	if (f >= 0)
-		MSG_WriteShort (sb, (int)(f*(65536.0f/360.0f) + 0.5f) & 65535);
+		MSG_WriteShort (sb, (int)(f + 0.5));
+	else
+		MSG_WriteShort (sb, (int)(f - 0.5));
+}
+
+void MSG_WriteCoord32f (sizebuf_t *sb, float f)
+{
+	MSG_WriteFloat (sb, f);
+}
+
+void MSG_WriteCoord (sizebuf_t *sb, float f, protocolversion_t protocol)
+{
+	if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_QUAKEDP || protocol == PROTOCOL_NEHAHRAMOVIE)
+		MSG_WriteCoord13i (sb, f);
+	else if (protocol == PROTOCOL_DARKPLACES1)
+		MSG_WriteCoord32f (sb, f);
+	else if (protocol == PROTOCOL_DARKPLACES2 || protocol == PROTOCOL_DARKPLACES3 || protocol == PROTOCOL_DARKPLACES4)
+		MSG_WriteCoord16i (sb, f);
 	else
-		MSG_WriteShort (sb, (int)(f*(65536.0f/360.0f) - 0.5f) & 65535);
+		MSG_WriteCoord32f (sb, f);
+}
+
+void MSG_WriteVector (sizebuf_t *sb, float *v, protocolversion_t protocol)
+{
+	MSG_WriteCoord (sb, v[0], protocol);
+	MSG_WriteCoord (sb, v[1], protocol);
+	MSG_WriteCoord (sb, v[2], protocol);
 }
 
 // LordHavoc: round to nearest value, rather than rounding toward zero, fixes crosshair problem
-void MSG_WriteAngle (sizebuf_t *sb, float f)
+void MSG_WriteAngle8i (sizebuf_t *sb, float f)
 {
 	if (f >= 0)
-		MSG_WriteByte (sb, (int)(f*(256.0f/360.0f) + 0.5f) & 255);
+		MSG_WriteByte (sb, (int)(f*(256.0/360.0) + 0.5) & 255);
+	else
+		MSG_WriteByte (sb, (int)(f*(256.0/360.0) - 0.5) & 255);
+}
+
+void MSG_WriteAngle16i (sizebuf_t *sb, float f)
+{
+	if (f >= 0)
+		MSG_WriteShort (sb, (int)(f*(65536.0/360.0) + 0.5) & 65535);
+	else
+		MSG_WriteShort (sb, (int)(f*(65536.0/360.0) - 0.5) & 65535);
+}
+
+void MSG_WriteAngle32f (sizebuf_t *sb, float f)
+{
+	MSG_WriteFloat (sb, f);
+}
+
+void MSG_WriteAngle (sizebuf_t *sb, float f, protocolversion_t protocol)
+{
+	if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_QUAKEDP || protocol == PROTOCOL_NEHAHRAMOVIE || protocol == PROTOCOL_DARKPLACES1 || protocol == PROTOCOL_DARKPLACES2 || protocol == PROTOCOL_DARKPLACES3 || protocol == PROTOCOL_DARKPLACES4)
+		MSG_WriteAngle8i (sb, f);
 	else
-		MSG_WriteByte (sb, (int)(f*(256.0f/360.0f) - 0.5f) & 255);
+		MSG_WriteAngle16i (sb, f);
 }
 
 //
 // reading functions
 //
-int                     msg_readcount;
-qboolean        msg_badread;
+int msg_readcount;
+qboolean msg_badread;
 
 void MSG_BeginReading (void)
 {
@@ -587,179 +340,163 @@ 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
 	{
-		qbyte    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;
 }
 
-char *MSG_ReadString (void)
+float MSG_ReadBigFloat (void)
 {
-	static char     string[2048];
-	int             l,c;
-
-	l = 0;
-	do
+	union
 	{
-		c = MSG_ReadChar ();
-		if (c == -1 || c == 0)
-			break;
-		string[l] = c;
-		l++;
-	} while (l < sizeof(string)-1);
-
-	string[l] = 0;
+		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;
+	for (l = 0;l < (int) sizeof(string) - 1 && (c = MSG_ReadChar()) != -1 && c != 0;l++)
+		string[l] = c;
+	string[l] = 0;
 	return string;
 }
 
-// used by server (always latest dpprotocol)
-float MSG_ReadDPCoord (void)
+int MSG_ReadBytes (int numbytes, unsigned char *out)
 {
-	return (signed short) MSG_ReadShort();
+	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)
+float MSG_ReadCoord13i (void)
 {
-	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);
+	return MSG_ReadLittleShort() * (1.0/8.0);
 }
 
-/*
-float MSG_ReadCoord (void)
+float MSG_ReadCoord16i (void)
 {
-	return MSG_ReadShort() * (1.0f/8.0f);
+	return (signed short) MSG_ReadLittleShort();
 }
 
-float MSG_ReadAngle (void)
+float MSG_ReadCoord32f (void)
 {
-	return MSG_ReadChar() * (360.0f/256.0f);
+	return MSG_ReadLittleFloat();
 }
 
-float MSG_ReadPreciseAngle (void)
+float MSG_ReadCoord (protocolversion_t protocol)
 {
-	return MSG_ReadShort() * (360.0f/65536);
+	if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_QUAKEDP || protocol == PROTOCOL_NEHAHRAMOVIE)
+		return MSG_ReadCoord13i();
+	else if (protocol == PROTOCOL_DARKPLACES1)
+		return MSG_ReadCoord32f();
+	else if (protocol == PROTOCOL_DARKPLACES2 || protocol == PROTOCOL_DARKPLACES3 || protocol == PROTOCOL_DARKPLACES4)
+		return MSG_ReadCoord16i();
+	else
+		return MSG_ReadCoord32f();
 }
-*/
 
+void MSG_ReadVector (float *v, protocolversion_t protocol)
+{
+	v[0] = MSG_ReadCoord(protocol);
+	v[1] = MSG_ReadCoord(protocol);
+	v[2] = MSG_ReadCoord(protocol);
+}
 
-//===========================================================================
+// LordHavoc: round to nearest value, rather than rounding toward zero, fixes crosshair problem
+float MSG_ReadAngle8i (void)
+{
+	return (signed char) MSG_ReadByte () * (360.0/256.0);
+}
 
-void SZ_Alloc (sizebuf_t *buf, int startsize, char *name)
+float MSG_ReadAngle16i (void)
 {
-	if (startsize < 256)
-		startsize = 256;
-	buf->mempool = Mem_AllocPool(name);
-	buf->data = Mem_Alloc(buf->mempool, startsize);
-	buf->maxsize = startsize;
-	buf->cursize = 0;
+	return (signed short)MSG_ReadShort () * (360.0/65536.0);
 }
 
+float MSG_ReadAngle32f (void)
+{
+	return MSG_ReadFloat ();
+}
 
-void SZ_Free (sizebuf_t *buf)
+float MSG_ReadAngle (protocolversion_t protocol)
 {
-	Mem_FreePool(&buf->mempool);
-	buf->data = NULL;
-	buf->maxsize = 0;
-	buf->cursize = 0;
+	if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_QUAKEDP || protocol == PROTOCOL_NEHAHRAMOVIE || protocol == PROTOCOL_DARKPLACES1 || protocol == PROTOCOL_DARKPLACES2 || protocol == PROTOCOL_DARKPLACES3 || protocol == PROTOCOL_DARKPLACES4)
+		return MSG_ReadAngle8i ();
+	else
+		return MSG_ReadAngle16i ();
 }
 
+
+//===========================================================================
+
 void SZ_Clear (sizebuf_t *buf)
 {
 	buf->cursize = 0;
@@ -767,43 +504,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");
+			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");
+		Con_Print("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)
+// LordHavoc: thanks to Fuh for bringing the pure evil of SZ_Print to my
+// attention, it has been eradicated from here, its only (former) use in
+// all of darkplaces.
+
+static char *hexchar = "0123456789ABCDEF";
+void Com_HexDumpToConsole(const qbyte *data, int size)
 {
-	int             len;
-	
-	len = strlen(data)+1;
+	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;
+		// print offset
+		*cur++ = hexchar[(i >> 12) & 15];
+		*cur++ = hexchar[(i >>  8) & 15];
+		*cur++ = hexchar[(i >>  4) & 15];
+		*cur++ = hexchar[(i >>  0) & 15];
+		*cur++ = ':';
+		// print hex
+		for (j = 0;j < 16;j++)
+		{
+			if (j < n)
+			{
+				*cur++ = hexchar[(d[j] >> 4) & 15];
+				*cur++ = hexchar[(d[j] >> 0) & 15];
+			}
+			else
+			{
+				*cur++ = ' ';
+				*cur++ = ' ';
+			}
+			if ((j & 3) == 3)
+				*cur++ = ' ';
+		}
+		// print text
+		for (j = 0;j < 16;j++)
+		{
+			if (j < n)
+			{
+				if (d[j] >= ' ' && d[j] <= 127)
+					*cur++ = d[j];
+				else
+					*cur++ = '.';
+			}
+			else
+				*cur++ = ' ';
+		}
+		*cur++ = '\n';
+		i += n;
+		if (cur >= flushpointer || i >= size)
+		{
+			*cur++ = 0;
+			Con_Print(text);
+			cur = text;
+		}
+	}
+}
 
-// byte * cast to keep VC++ happy
-	if (buf->data[buf->cursize-1])
-		memcpy ((qbyte *)SZ_GetSpace(buf, len),data,len); // no trailing 0
-	else
-		memcpy ((qbyte *)SZ_GetSpace(buf, len-1)-1,data,len); // write over trailing 0
+void SZ_HexDumpToConsole(const sizebuf_t *buf)
+{
+	Com_HexDumpToConsole(buf->data, buf->cursize);
 }
 
 
@@ -811,200 +605,209 @@ 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;
+	int len;
+	const char *data = *datapointer;
+
+	len = 0;
+	com_token[0] = 0;
 
-	last = pathname;
-	while (*pathname)
+	if (!data)
 	{
-		if (*pathname=='/')
-			last = pathname+1;
-		pathname++;
+		*datapointer = NULL;
+		return false;
 	}
-	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)
+// skip whitespace
+skipwhite:
+	// line endings:
+	// UNIX: \n
+	// Mac: \r
+	// Windows: \r\n
+	for (;*data <= ' ' && ((*data != '\n' && *data != '\r') || !returnnewline);data++)
 	{
-		if (*in == '.')
-			last = out;
-		else if (*in == '/' || *in == '\\' || *in == ':')
-			last = NULL;
-		*out++ = *in++;
+		if (*data == 0)
+		{
+			// end of file
+			*datapointer = NULL;
+			return false;
+		}
 	}
-	if (last)
-		*last = 0;
-}
-
-/*
-============
-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;
+	// handle Windows line ending
+	if (data[0] == '\r' && data[1] == '\n')
+		data++;
 
-	slash = in;
-	dot = NULL;
-	s = in;
-	while(*s)
+	if (data[0] == '/' && data[1] == '/')
 	{
-		if (*s == '/')
-			slash = s + 1;
-		if (*s == '.')
-			dot = s;
-		s++;
+		// comment
+		while (*data && *data != '\n' && *data != '\r')
+			data++;
+		goto skipwhite;
 	}
-	if (dot == NULL)
-		dot = s;
-	if (dot - slash < 2)
-		strcpy (out,"?model?");
-	else
+	else if (data[0] == '/' && data[1] == '*')
 	{
-		while (slash < dot)
-			*out++ = *slash++;
-		*out++ = 0;
+		// comment
+		data++;
+		while (*data && (data[0] != '*' || data[1] != '/'))
+			data++;
+		data += 2;
+		goto skipwhite;
 	}
-}
-
-
-/*
-==================
-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;
-
-	while (*src != '/' && src != path)
+	else if (*data == '\"')
+	{
+		// quoted string
+		for (data++;*data != '\"';data++)
+		{
+			if (*data == '\\' && data[1] == '"' )
+				data++;
+			if (!*data || len >= (int)sizeof(com_token) - 1)
+			{
+				com_token[0] = 0;
+				*datapointer = NULL;
+				return false;
+			}
+			com_token[len++] = *data;
+		}
+		com_token[len] = 0;
+		*datapointer = data+1;
+		return true;
+	}
+	else if (*data == '\'')
+	{
+		// quoted string
+		for (data++;*data != '\'';data++)
+		{
+			if (*data == '\\' && data[1] == '\'' )
+				data++;
+			if (!*data || len >= (int)sizeof(com_token) - 1)
+			{
+				com_token[0] = 0;
+				*datapointer = NULL;
+				return false;
+			}
+			com_token[len++] = *data;
+		}
+		com_token[len] = 0;
+		*datapointer = data+1;
+		return true;
+	}
+	else if (*data == '\r')
 	{
-		if (*src == '.')
-			return;                 // it has an extension
-		src--;
+		// translate Mac line ending to UNIX
+		com_token[len++] = '\n';
+		com_token[len] = 0;
+		*datapointer = data;
+		return true;
+	}
+	else if (*data == '\n' || *data == '{' || *data == '}' || *data == ')' || *data == '(' || *data == ']' || *data == '[' || *data == '\'' || *data == ':' || *data == ',' || *data == ';')
+	{
+		// single character
+		com_token[len++] = *data++;
+		com_token[len] = 0;
+		*datapointer = data;
+		return true;
+	}
+	else
+	{
+		// regular word
+		for (;*data > ' ' && *data != '{' && *data != '}' && *data != ')' && *data != '(' && *data != ']' && *data != '[' && *data != '\'' && *data != ':' && *data != ',' && *data != ';' && *data != '\'' && *data != '"';data++)
+		{
+			if (len >= (int)sizeof(com_token) - 1)
+			{
+				com_token[0] = 0;
+				*datapointer = NULL;
+				return false;
+			}
+			com_token[len++] = *data;
+		}
+		com_token[len] = 0;
+		*datapointer = data;
+		return true;
 	}
-
-	strcat (path, extension);
 }
 
-
 /*
 ==============
-COM_Parse
+COM_ParseTokenConsole
 
-Parse a token out of a string
+Parse a token out of a string, behaving like the qwcl console
 ==============
 */
-char *COM_Parse (char *data)
+int COM_ParseTokenConsole(const char **datapointer)
 {
-	int             c;
-	int             len;
-	
+	int len;
+	const char *data = *datapointer;
+
 	len = 0;
 	com_token[0] = 0;
-	
+
 	if (!data)
-		return NULL;
-		
+	{
+		*datapointer = NULL;
+		return false;
+	}
+
 // skip whitespace
 skipwhite:
-	while ( (c = *data) <= ' ')
+	for (;*data <= ' ';data++)
 	{
-		if (c == 0)
-			return NULL;                    // end of file;
-		data++;
+		if (*data == 0)
+		{
+			// end of file
+			*datapointer = NULL;
+			return false;
+		}
 	}
-	
-// skip // comments
-	if (c=='/' && data[1] == '/')
+
+	if (*data == '/' && data[1] == '/')
 	{
-		while (*data && *data != '\n')
+		// comment
+		while (*data && *data != '\n' && *data != '\r')
 			data++;
 		goto skipwhite;
 	}
-	
-
-// handle quoted strings specially
-	if (c == '\"')
+	else if (*data == '\"')
 	{
-		data++;
-		while (1)
+		// quoted string
+		for (data++;*data != '\"';data++)
 		{
-			c = *data++;
-			if (c=='\"' || !c)
+			if (!*data || len >= (int)sizeof(com_token) - 1)
 			{
-				com_token[len] = 0;
-				return data;
+				com_token[0] = 0;
+				*datapointer = NULL;
+				return false;
 			}
-			com_token[len] = c;
-			len++;
+			com_token[len++] = *data;
 		}
+		com_token[len] = 0;
+		*datapointer = data+1;
 	}
-
-// parse single characters
-	if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c==':')
+	else
 	{
-		com_token[len] = c;
-		len++;
+		// regular word
+		for (;*data > ' ';data++)
+		{
+			if (len >= (int)sizeof(com_token) - 1)
+			{
+				com_token[0] = 0;
+				*datapointer = NULL;
+				return false;
+			}
+			com_token[len++] = *data;
+		}
 		com_token[len] = 0;
-		return data+1;
+		*datapointer = data;
 	}
 
-// parse a regular word
-	do
-	{
-		com_token[len] = c;
-		data++;
-		len++;
-		c = *data;
-	if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c==':')
-			break;
-	} while (c>32);
-	
-	com_token[len] = 0;
-	return data;
+	return true;
 }
 
 
@@ -1016,10 +819,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 ; i<com_argc ; i++)
 	{
 		if (!com_argv[i])
@@ -1027,7 +830,7 @@ int COM_CheckParm (char *parm)
 		if (!strcmp (parm,com_argv[i]))
 			return i;
 	}
-		
+
 	return 0;
 }
 
@@ -1045,185 +848,179 @@ void COM_CheckRegistered (void)
 {
 	Cvar_Set ("cmdline", com_cmdline);
 
-//	static_registered = 0;
-
-	if (!Sys_FileTime("gfx/pop.lmp"))
+	if (gamemode == GAME_NORMAL && !FS_FileExists("gfx/pop.lmp"))
 	{
-		if (com_modified)
-			Con_Printf ("Playing shareware version, with modification.\nwarning: most mods require full quake data.\n");
+		if (fs_modified)
+			Con_Print("Playing shareware version, with modification.\nwarning: most mods require full quake data.\n");
 		else
-			Con_Printf ("Playing shareware version.\n");
-//#if WINDED
-//	Sys_Error ("This dedicated server requires a full registered copy of Quake");
-//#endif
-//		Con_Printf ("Playing shareware version.\n");
-//		if (com_modified)
-//			Sys_Error ("You must have the registered version to use modified games");
+			Con_Print("Playing shareware version.\n");
 		return;
 	}
 
-//	Cvar_Set ("cmdline", com_cmdline);
 	Cvar_Set ("registered", "1");
-//	static_registered = 1;
-	Con_Printf ("Playing registered version.\n");
+	Con_Print("Playing registered version.\n");
 }
 
 
-void COM_Path_f (void);
-
-
 /*
 ================
 COM_InitArgv
 ================
 */
-void COM_InitArgv (int argc, char **argv)
+void COM_InitArgv (void)
 {
-	qboolean        safe;
-	int             i, j, n;
-
-// reconstitute the command line for the cmdline externally visible cvar
+	int i, j, n;
+	// reconstitute the command line for the cmdline externally visible cvar
 	n = 0;
-
-	for (j=0 ; (j<MAX_NUM_ARGVS) && (j< argc) ; j++)
+	for (j = 0;(j < MAX_NUM_ARGVS) && (j < com_argc);j++)
 	{
 		i = 0;
-
-		while ((n < (CMDLINE_LENGTH - 1)) && argv[j][i])
+		if (strstr(com_argv[j], " "))
 		{
-			com_cmdline[n++] = argv[j][i++];
+			// arg contains whitespace, store quotes around it
+			com_cmdline[n++] = '\"';
+			while ((n < (CMDLINE_LENGTH - 1)) && com_argv[j][i])
+				com_cmdline[n++] = com_argv[j][i++];
+			com_cmdline[n++] = '\"';
+		}
+		else
+		{
+			while ((n < (CMDLINE_LENGTH - 1)) && com_argv[j][i])
+				com_cmdline[n++] = com_argv[j][i++];
 		}
-
 		if (n < (CMDLINE_LENGTH - 1))
 			com_cmdline[n++] = ' ';
 		else
 			break;
 	}
-
 	com_cmdline[n] = 0;
+}
 
-	safe = false;
 
-	for (com_argc=0 ; (com_argc<MAX_NUM_ARGVS) && (com_argc < argc) ;
-		 com_argc++)
-	{
-		largv[com_argc] = argv[com_argc];
-		if (!strcmp ("-safe", argv[com_argc]))
-			safe = true;
-	}
+//===========================================================================
 
-	if (safe)
-	{
-	// force all the safe-mode switches. Note that we reserved extra space in
-	// case we need to add these, so we don't need an overflow check
-		for (i=0 ; i<NUM_SAFE_ARGVS ; i++)
+// Game mods
+
+typedef struct
+{
+	const char* prog_name;
+	const char* cmdline;
+	const char* gamename;
+	const char* gamedirname1;
+	const char* gamedirname2;
+	const char* gamescreenshotname;
+	const char* gameuserdirname;
+} gamemode_info_t;
+
+static const gamemode_info_t gamemode_info [] =
+{// prog_name		cmdline			gamename				gamedirname	gamescreenshotname
+
+// GAME_NORMAL
+// COMMANDLINEOPTION: Game: -quake runs the game Quake (default)
+{ "",				"-quake",		"DarkPlaces-Quake",		"id1",		NULL,			"dp",			"darkplaces" },
+// GAME_HIPNOTIC
+// COMMANDLINEOPTION: Game: -hipnotic runs Quake mission pack 1: The Scourge of Armagon
+{ "hipnotic",		"-hipnotic",	"Darkplaces-Hipnotic",	"id1",		"hipnotic",		"dp",			"darkplaces" },
+// GAME_ROGUE
+// COMMANDLINEOPTION: Game: -rogue runs Quake mission pack 2: The Dissolution of Eternity
+{ "rogue",			"-rogue",		"Darkplaces-Rogue",		"id1",		"rogue",		"dp",			"darkplaces" },
+// GAME_NEHAHRA
+// COMMANDLINEOPTION: Game: -nehahra runs The Seal of Nehahra movie and game
+{ "nehahra",		"-nehahra",		"DarkPlaces-Nehahra",	"id1",		"nehahra",		"dp",			"darkplaces" },
+// GAME_NEXUIZ
+// COMMANDLINEOPTION: Game: -nexuiz runs the multiplayer game Nexuiz
+{ "nexuiz",			"-nexuiz",		"Nexuiz",				"data",		NULL,			"nexuiz",		"nexuiz" },
+// GAME_TRANSFUSION
+// COMMANDLINEOPTION: Game: -transfusion runs Transfusion (the recreation of Blood in Quake)
+{ "transfusion",	"-transfusion",	"Transfusion",			"basetf",	NULL,			"transfusion",	"transfusion" },
+// GAME_GOODVSBAD2
+// COMMANDLINEOPTION: Game: -goodvsbad2 runs the psychadelic RTS FPS game Good Vs Bad 2
+{ "gvb2",			"-goodvsbad2",	"GoodVs.Bad2",			"rts",		NULL,			"gvb2",			"gvb2" },
+// GAME_TEU
+// COMMANDLINEOPTION: Game: -teu runs The Evil Unleashed (this option is obsolete as they are not using darkplaces)
+{ "teu",			"-teu",			"TheEvilUnleashed",		"baseteu",	NULL,			"teu",			"teu" },
+// GAME_BATTLEMECH
+// COMMANDLINEOPTION: Game: -battlemech runs the multiplayer topdown deathmatch game BattleMech
+{ "battlemech",		"-battlemech",	"Battlemech",			"base",		NULL,			"battlemech",	"battlemech" },
+// GAME_ZYMOTIC
+// COMMANDLINEOPTION: Game: -zymotic runs the singleplayer game Zymotic
+{ "zymotic",		"-zymotic",		"Zymotic",				"data",		NULL,			"zymotic",		"zymotic" },
+// GAME_FNIGGIUM
+// COMMANDLINEOPTION: Game: -fniggium runs the post apocalyptic melee RPG Fniggium
+{ "fniggium",		"-fniggium",	"Fniggium",				"data",		NULL,			"fniggium",		"fniggium" },
+// GAME_SETHERAL
+// COMMANDLINEOPTION: Game: -setheral runs the multiplayer game Setheral
+{ "setheral",		"-setheral",	"Setheral",				"data",		NULL,			"setheral",		"setheral" },
+// GAME_SOM
+// COMMANDLINEOPTION: Game: -som runs the multiplayer game Son Of Man
+{ "som",			"-som",			"Son of Man",			"id1",		"sonofman",		"som",			"darkplaces" },
+// GAME_TENEBRAE
+// COMMANDLINEOPTION: Game: -tenebrae runs the graphics test mod known as Tenebrae (some features not implemented)
+{ "tenebrae",		"-tenebrae",	"DarkPlaces-Tenebrae",	"id1",		"tenebrae",		"dp",			"darkplaces" },
+// GAME_NEOTERIC
+// COMMANDLINEOPTION: Game: -neoteric runs the game Neoteric
+{ "neoteric",		"-neoteric",	"Neoteric",				"id1",		"neobase",		"neo",			"darkplaces" },
+// GAME_OPENQUARTZ
+// COMMANDLINEOPTION: Game: -openquartz runs the game OpenQuartz, a standalone GPL replacement of the quake content
+{ "openquartz",		"-openquartz",	"OpenQuartz",			"id1",		NULL,			"openquartz",	"darkplaces" },
+// GAME_PRYDON
+// COMMANDLINEOPTION: Game: -prydon runs the topdown point and click action-RPG Prydon Gate
+{ "prydon",			"-prydon",		"PrydonGate",			"id1",		"prydon",		"prydon",		"darkplaces" },
+// GAME_NETHERWORLD
+// COMMANDLINEOPTION: Game: -netherworld runs the game Netherworld: Dark Master
+{ "netherworld",	"-netherworld",	"Netherworld: Dark Master",	"id1",		"netherworld", 	"nw",			"darkplaces" },
+// GAME_THEHUNTED
+// COMMANDLINEOPTION: Game: -thehunted runs the game The Hunted
+{ "thehunted",		"-thehunted",	"The Hunted",			"thdata",	NULL, 			"th",			"thehunted" },
+// GAME_DEFEATINDETAIL2
+// COMMANDLINEOPTION: Game: -did2 runs the game Defeat In Detail 2
+{ "did2",			"-did2",		"Defeat In Detail 2",	"data",		NULL, 			"did2_",		"did2" },
+};
+
+void COM_InitGameType (void)
+{
+	char name [MAX_OSPATH];
+	unsigned int i;
+
+	FS_StripExtension (com_argv[0], name, sizeof (name));
+	COM_ToLowerString (name, name, sizeof (name));
+
+	// Check the binary name; default to GAME_NORMAL (0)
+	gamemode = GAME_NORMAL;
+	for (i = 1; i < sizeof (gamemode_info) / sizeof (gamemode_info[0]); i++)
+		if (strstr (name, gamemode_info[i].prog_name))
+		{
+			gamemode = i;
+			break;
+		}
+
+	// Look for a command-line option
+	for (i = 0; i < sizeof (gamemode_info) / sizeof (gamemode_info[0]); i++)
+		if (COM_CheckParm (gamemode_info[i].cmdline))
 		{
-			largv[com_argc] = safeargvs[i];
-			com_argc++;
+			gamemode = i;
+			break;
 		}
-	}
 
-	largv[com_argc] = argvdummy;
-	com_argv = largv;
-
-#if BLOODBATH
-	gamemode = GAME_BLOODBATH;
-#elif ZYMOTIC
-	gamemode = GAME_ZYMOTIC;
-#elif FIENDARENA
-	gamemode = GAME_FIENDARENA;
-#elif NEHAHRA
-	gamemode = GAME_NEHAHRA;
-#else
-	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)
-	{
-	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;
-	}
+	gamename = gamemode_info[gamemode].gamename;
+	gamedirname1 = gamemode_info[gamemode].gamedirname1;
+	gamedirname2 = gamemode_info[gamemode].gamedirname2;
+	gamescreenshotname = gamemode_info[gamemode].gamescreenshotname;
+	gameuserdirname = gamemode_info[gamemode].gameuserdirname;
 }
 
 
-extern void Mathlib_Init(void);
-
 /*
 ================
 COM_Init
 ================
 */
-void COM_Init (void)
+void COM_Init_Commands (void)
 {
-#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)
-	qbyte    swaptest[2] = {1,0};
-
-// set the byte swapping variables in a portable manner
-	if ( *(short *)swaptest == 1)
-	{
-		BigShort = ShortSwap;
-		LittleShort = ShortNoSwap;
-		BigLong = LongSwap;
-		LittleLong = LongNoSwap;
-		BigFloat = FloatSwap;
-		LittleFloat = FloatNoSwap;
-	}
-	else
-	{
-		BigShort = ShortNoSwap;
-		LittleShort = ShortSwap;
-		BigLong = LongNoSwap;
-		LittleLong = LongSwap;
-		BigFloat = FloatNoSwap;
-		LittleFloat = FloatSwap;
-	}
-#endif
-
-	pak_mempool = Mem_AllocPool("paks");
-
 	Cvar_RegisterVariable (&registered);
 	Cvar_RegisterVariable (&cmdline);
-	Cmd_AddCommand ("path", COM_Path_f);
-
-	Mathlib_Init();
-
-	COM_InitFilesystem ();
-	COM_CheckRegistered ();
 }
 
-
 /*
 ============
 va
@@ -1233,7 +1030,7 @@ varargs versions of all text functions.
 FIXME: make this buffer size safe someday
 ============
 */
-char    *va(char *format, ...)
+char *va(const char *format, ...)
 {
 	va_list argptr;
 	// LordHavoc: now cycles through 8 buffers to avoid problems in most cases
@@ -1243,724 +1040,302 @@ char    *va(char *format, ...)
 	s = string[stringindex];
 	stringindex = (stringindex + 1) & 7;
 	va_start (argptr, format);
-	vsprintf (s, format,argptr);
+	dpvsnprintf (s, sizeof (string[0]), format,argptr);
 	va_end (argptr);
 
 	return s;
 }
 
 
-/// just for debugging
-int     memsearch (qbyte *start, int count, int search)
-{
-	int             i;
-
-	for (i=0 ; i<count ; i++)
-		if (start[i] == search)
-			return i;
-	return -1;
-}
-
-/*
-=============================================================================
-
-QUAKE FILESYSTEM
-
-=============================================================================
-*/
-
-int     com_filesize;
-
-
-//
-// in memory
-//
-
-typedef struct
-{
-	char name[MAX_QPATH];
-	int filepos, filelen;
-} packfile_t;
-
-typedef struct pack_s
-{
-	char filename[MAX_OSPATH];
-	int handle;
-	int numfiles;
-	packfile_t *files;
-	mempool_t *mempool;
-	struct pack_s *next;
-} pack_t;
-
-//
-// on disk
-//
-typedef struct
-{
-	char name[56];
-	int filepos, filelen;
-} dpackfile_t;
-
-typedef struct
-{
-	char id[4];
-	int dirofs;
-	int dirlen;
-} dpackheader_t;
+//======================================
 
-// LordHavoc: was 2048, increased to 65536 and changed info[MAX_PACK_FILES] to a temporary alloc
-#define MAX_FILES_IN_PACK       65536
+// snprintf and vsnprintf are NOT portable. Use their DP counterparts instead
 
-pack_t	*packlist = NULL;
+#undef snprintf
+#undef vsnprintf
 
-#if CACHEENABLE
-char	com_cachedir[MAX_OSPATH];
+#ifdef WIN32
+# define snprintf _snprintf
+# define vsnprintf _vsnprintf
 #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
-	struct searchpath_s *next;
-} searchpath_t;
 
-searchpath_t    *com_searchpaths;
-
-/*
-============
-COM_Path_f
 
-============
-*/
-void COM_Path_f (void)
+int dpsnprintf (char *buffer, size_t buffersize, const char *format, ...)
 {
-	searchpath_t    *s;
-
-	Con_Printf ("Current search path:\n");
-	for (s=com_searchpaths ; s ; s=s->next)
-	{
-		if (s->pack)
-		{
-			Con_Printf ("%s (%i files)\n", s->pack->filename, s->pack->numfiles);
-		}
-		else
-			Con_Printf ("%s\n", s->filename);
-	}
-}
+	va_list args;
+	int result;
 
-/*
-============
-COM_CreatePath
-
-LordHavoc: Previously only used for CopyFile, now also used for COM_WriteFile.
-============
-*/
-void    COM_CreatePath (char *path)
-{
-	char    *ofs, save;
+	va_start (args, format);
+	result = dpvsnprintf (buffer, buffersize, format, args);
+	va_end (args);
 
-	for (ofs = path+1 ; *ofs ; ofs++)
-	{
-		if (*ofs == '/' || *ofs == '\\')
-		{
-			// create the directory
-			save = *ofs;
-			*ofs = 0;
-			Sys_mkdir (path);
-			*ofs = save;
-		}
-	}
+	return result;
 }
 
 
-/*
-============
-COM_WriteFile
-
-The filename will be prefixed by the current game directory
-============
-*/
-void COM_WriteFile (char *filename, void *data, int len)
+int dpvsnprintf (char *buffer, size_t buffersize, const char *format, va_list args)
 {
-	int             handle;
-	char    name[MAX_OSPATH];
-
-	sprintf (name, "%s/%s", com_gamedir, filename);
+	int result;
 
-	// LordHavoc: added this
-	COM_CreatePath (name); // create directories up to the file
-
-	handle = Sys_FileOpenWrite (name);
-	if (handle == -1)
+	result = vsnprintf (buffer, buffersize, format, args);
+	if (result < 0 || (size_t)result >= buffersize)
 	{
-		Sys_Printf ("COM_WriteFile: failed on %s\n", name);
-		return;
+		buffer[buffersize - 1] = '\0';
+		return -1;
 	}
 
-	Con_Printf ("COM_WriteFile: %s\n", name);
-	Sys_FileWrite (handle, data, len);
-	Sys_FileClose (handle);
+	return result;
 }
 
 
-/*
-===========
-COM_CopyFile
+//======================================
 
-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, size_t size_out)
 {
-	int             in, out;
-	int             remaining, count;
-	char    buf[4096];
+	if (size_out == 0)
+		return;
 
-	remaining = Sys_FileOpenRead (netpath, &in);            
-	COM_CreatePath (cachepath);     // create directories up to the cache file
-	out = Sys_FileOpenWrite (cachepath);
-	
-	while (remaining)
+	while (*in && size_out > 1)
 	{
-		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;
+			*out++ = *in++;
+		size_out--;
 	}
-
-	Sys_FileClose (in);
-	Sys_FileClose (out);    
+	*out = '\0';
 }
 
-/*
-===========
-COM_OpenRead
-===========
-*/
-QFile * COM_OpenRead (const char *path, int offs, int len, qboolean zip)
+void COM_ToUpperString (const char *in, char *out, size_t size_out)
 {
-	int				fd = open (path, O_RDONLY);
-	unsigned char	id[2];
-	unsigned char	len_bytes[4];
+	if (size_out == 0)
+		return;
 
-	if (fd == -1)
+	while (*in && size_out > 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]));
-		}
+		if (*in >= 'a' && *in <= 'z')
+			*out++ = *in++ + 'A' - 'a';
+		else
+			*out++ = *in++;
+		size_out--;
 	}
-	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");
+	*out = '\0';
 }
 
-/*
-===========
-COM_FindFile
+int COM_StringBeginsWith(const char *s, const char *match)
+{
+	for (;*s && *match;s++, match++)
+		if (*s != *match)
+			return false;
+	return true;
+}
 
-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)
+int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize, const char *commentprefix)
 {
-	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)
+	int argc, commentprefixlength;
+	char *tokenbufend;
+	const char *l;
+	argc = 0;
+	tokenbufend = tokenbuf + tokenbufsize;
+	l = *text;
+	commentprefixlength = 0;
+	if (commentprefix)
+		commentprefixlength = (int)strlen(commentprefix);
+	while (*l && *l != '\n' && *l != '\r')
 	{
-	// is the element a pak file?
-		if (search->pack)
+		if (*l > ' ')
 		{
-		// look through all the pak file elements
-			pak = search->pack;
-			for (i=0 ; i<pak->numfiles ; 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 (commentprefixlength && !strncmp(l, commentprefix, commentprefixlength))
+			{
+				while (*l && *l != '\n' && *l != '\r')
+					l++;
+				break;
+			}
+			if (argc >= maxargc)
+				return -1;
+			argv[argc++] = tokenbuf;
+			if (*l == '"')
+			{
+				l++;
+				while (*l && *l != '"')
+				{
+					if (tokenbuf >= tokenbufend)
+						return -1;
+					*tokenbuf++ = *l++;
 				}
+				if (*l == '"')
+					l++;
+			}
+			else
+			{
+				while (*l > ' ')
+				{
+					if (tokenbuf >= tokenbufend)
+						return -1;
+					*tokenbuf++ = *l++;
+				}
+			}
+			if (tokenbuf >= tokenbufend)
+				return -1;
+			*tokenbuf++ = 0;
 		}
 		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;
-		}
-		
+			l++;
 	}
-	
-	if (!quiet)
-		Sys_Printf ("FindFile: can't find %s\n", filename);
-	
-	*file = NULL;
-	com_filesize = -1;
-	return -1;
+	// line endings:
+	// UNIX: \n
+	// Mac: \r
+	// Windows: \r\n
+	if (*l == '\r')
+		l++;
+	if (*l == '\n')
+		l++;
+	*text = l;
+	return argc;
 }
 
-
-/*
-===========
-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)
+// written by Elric, thanks Elric!
+char *SearchInfostring(const char *infostring, const char *key)
 {
-	return COM_FindFile (filename, file, quiet, zip);
-}
-
+	static char value [256];
+	char crt_key [256];
+	size_t value_ind, key_ind;
+	char c;
 
-/*
-============
-COM_LoadFile
-
-Filename are reletive to the quake directory.
-Always appends a 0 byte.
-============
-*/
-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_FOpenFile (path, &h, quiet, true);
-	if (!h)
+	if (*infostring++ != '\\')
 		return NULL;
 
-	loadsize = len;
-
-// extract the filename base name for hunk tag
-	COM_FileBase (path, base);
-
-	buf = Mem_Alloc(tempmempool, len+1);
-	if (!buf)
-		Sys_Error ("COM_LoadFile: not enough available memory for %s (size %i)", path, len);
-
-	((qbyte *)buf)[len] = 0;
-
-	Qread (h, buf, len);
-	Qclose (h);
-
-	return buf;
-}
-
-/*
-=================
-COM_LoadPackFile
-
-Takes an explicit (not game tree related) path to a pak file.
-
-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;
-	int				numpackfiles;
-	pack_t			*pack;
-	int				packhandle;
-	// LordHavoc: changed from stack array to temporary alloc, allowing huge pack directories
-	dpackfile_t		*info;
-
-	if (Sys_FileOpenRead (packfile, &packhandle) == -1)
-	{
-		//Con_Printf ("Couldn't open %s\n", packfile);
-		return NULL;
-	}
-	Sys_FileRead (packhandle, (void *)&header, sizeof(header));
-	if (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);
-
-	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 = Mem_Alloc(tempmempool, sizeof(*info) * numpackfiles);
-	Sys_FileSeek (packhandle, header.dirofs);
-	Sys_FileRead (packhandle, (void *)info, header.dirlen);
-
-// parse the directory
-	for (i = 0;i < numpackfiles;i++)
+	value_ind = 0;
+	for (;;)
 	{
-		strcpy (pack->files[i].name, info[i].name);
-		pack->files[i].filepos = LittleLong(info[i].filepos);
-		pack->files[i].filelen = LittleLong(info[i].filelen);
-	}
-
-	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 ...
-================
-*/
-void COM_AddGameDirectory (char *dir)
-{
-	//int i;
-	stringlist_t *list, *current;
-	searchpath_t *search;
-	pack_t *pak;
-	char pakfile[MAX_OSPATH];
+		key_ind = 0;
 
-	strcpy (com_gamedir, dir);
-
-//
-// add the directory to the search path
-//
-	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"))
+		// Get the key name
+		for (;;)
 		{
-			sprintf (pakfile, "%s/%s", dir, current->text);
-			pak = COM_LoadPackFile (pakfile);
-			if (pak)
+			c = *infostring++;
+
+			if (c == '\0')
+				return NULL;
+			if (c == '\\' || key_ind == sizeof (crt_key) - 1)
 			{
-				search = Mem_Alloc(pak_mempool, sizeof(searchpath_t));
-				search->pack = pak;
-				search->next = com_searchpaths;
-				com_searchpaths = search;
+				crt_key[key_ind] = '\0';
+				break;
 			}
-			else
-				Con_Printf("unable to load pak \"%s\"\n", pakfile);
-		}
-	}
-	freedirectory(list);
-
-	/*
-//
-// 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 = 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
-//
-
-}
-
-/*
-================
-COM_InitFilesystem
-================
-*/
-void COM_InitFilesystem (void)
-{
-	int             i, j;
-	char    basedir[MAX_OSPATH];
-	searchpath_t    *search;
 
-//
-// -basedir <path>
-// 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 <path>
-// 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
+			crt_key[key_ind++] = c;
+		}
 
-// start up with GAMENAME by default (id1)
-	COM_AddGameDirectory (va("%s/"GAMENAME, basedir) );
+		// If it's the key we are looking for, save it in "value"
+		if (!strcmp(crt_key, key))
+		{
+			for (;;)
+			{
+				c = *infostring++;
 
-	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;
-	case GAME_BLOODBATH:
-		COM_AddGameDirectory (va("%s/bb", basedir) );
-		break;
-	default:
-		Sys_Error("COM_InitFilesystem: unknown gamemode %i\n", gamemode);
-		break;
-	}
+				if (c == '\0' || c == '\\' || value_ind == sizeof (value) - 1)
+				{
+					value[value_ind] = '\0';
+					return value;
+				}
 
-//
-// -game <gamedir>
-// 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]));
-	}
+				value[value_ind++] = c;
+			}
+		}
 
-//
-// -path <dir or packfile> [<dir or packfile>] ...
-// 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)
+		// Else, skip the value
+		for (;;)
 		{
-			if (!com_argv[i] || com_argv[i][0] == '+' || com_argv[i][0] == '-')
-				break;
+			c = *infostring++;
 
-			search = Mem_Alloc(pak_mempool, sizeof(searchpath_t));
-			if ( !strcmp(COM_FileExtension(com_argv[i]), "pak") )
-			{
-				search->pack = COM_LoadPackFile (com_argv[i]);
-				if (!search->pack)
-					Sys_Error ("Couldn't load packfile: %s", com_argv[i]);
-			}
-			else
-				strcpy (search->filename, com_argv[i]);
-			search->next = com_searchpaths;
-			com_searchpaths = search;
+			if (c == '\0')
+				return NULL;
+			if (c == '\\')
+				break;
 		}
 	}
-
-//	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;
+//========================================================
+// strlcat and strlcpy, from OpenBSD
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*	$OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $	*/
+/*	$OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $	*/
+
+
+#ifndef HAVE_STRLCAT
+size_t
+strlcat(char *dst, const char *src, size_t siz)
+{
+	register char *d = dst;
+	register const char *s = src;
+	register size_t n = siz;
+	size_t dlen;
+
+	/* Find the end of dst and adjust bytes left but don't go past end */
+	while (n-- != 0 && *d != '\0')
+		d++;
+	dlen = d - dst;
+	n = siz - dlen;
+
+	if (n == 0)
+		return(dlen + strlen(s));
+	while (*s != '\0') {
+		if (n != 1) {
+			*d++ = *s;
+			n--;
 		}
-		else
-		{
-			sprintf (netpath, "%s/%s",search->filename, filename);
-			findtime = Sys_FileTime (netpath);
-			if (findtime != -1)
-				return true;
-		}		
+		s++;
 	}
+	*d = '\0';
 
-	return false;
+	return(dlen + (s - src));	/* count does not include NUL */
 }
+#endif  // #ifndef HAVE_STRLCAT
 
 
-//======================================
-// LordHavoc: added these because they are useful
-
-void COM_ToLowerString(char *in, char *out)
+#ifndef HAVE_STRLCPY
+size_t
+strlcpy(char *dst, const char *src, size_t siz)
 {
-	while (*in)
-	{
-		if (*in >= 'A' && *in <= 'Z')
-			*out++ = *in++ + 'a' - 'A';
-		else
-			*out++ = *in++;
+	register char *d = dst;
+	register const char *s = src;
+	register size_t n = siz;
+
+	/* Copy as many bytes as will fit */
+	if (n != 0 && --n != 0) {
+		do {
+			if ((*d++ = *s++) == 0)
+				break;
+		} while (--n != 0);
 	}
-}
 
-void COM_ToUpperString(char *in, char *out)
-{
-	while (*in)
-	{
-		if (*in >= 'a' && *in <= 'z')
-			*out++ = *in++ + 'A' - 'a';
-		else
-			*out++ = *in++;
+	/* Not enough room in dst, add NUL and traverse rest of src */
+	if (n == 0) {
+		if (siz != 0)
+			*d = '\0';		/* NUL-terminate dst */
+		while (*s++)
+			;
 	}
+
+	return(s - src - 1);	/* count does not include NUL */
 }
+
+#endif  // #ifndef HAVE_STRLCPY