X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=common.c;h=a1f1b405154b6c0a2db4ece6f774294c65df98f9;hb=9cff7ce705dc918e3a343bee67dd8d734101c310;hp=518ad5b9594d198fcc95bf6556347b506210d7fb;hpb=ca913e8190a32d6e96dededdb0a6f8d5ce72bf63;p=xonotic%2Fdarkplaces.git

diff --git a/common.c b/common.c
index 518ad5b9..a1f1b405 100644
--- a/common.c
+++ b/common.c
@@ -353,16 +353,10 @@ int MSG_ReadBytes (int numbytes, unsigned char *out)
 	return l;
 }
 
-// used by server (always latest PROTOCOL_DARKPLACES)
-float MSG_ReadDPCoord (void)
-{
-	return (signed short) MSG_ReadLittleShort();
-}
-
 // used by client
 float MSG_ReadCoord (void)
 {
-	if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
+	if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5)
 		return (signed short) MSG_ReadLittleShort();
 	else if (cl.protocol == PROTOCOL_DARKPLACES1)
 		return MSG_ReadLittleFloat();
@@ -425,17 +419,9 @@ void SZ_Write (sizebuf_t *buf, const void *data, int length)
 	memcpy (SZ_GetSpace(buf,length),data,length);
 }
 
-void SZ_Print (sizebuf_t *buf, const char *data)
-{
-	int len;
-	len = strlen(data)+1;
-
-// 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
-}
+// 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)
@@ -508,7 +494,6 @@ Parse a token out of a string
 */
 int COM_ParseToken(const char **datapointer, int returnnewline)
 {
-	int c;
 	int len;
 	const char *data = *datapointer;
 
@@ -523,79 +508,74 @@ int COM_ParseToken(const char **datapointer, int returnnewline)
 
 // skip whitespace
 skipwhite:
-	while ((c = *data) <= ' ' && (c != '\n' || !returnnewline))
+	for (;*data <= ' ' && (*data != '\n' || !returnnewline);data++)
 	{
-		if (c == 0)
+		if (*data == 0)
 		{
 			// end of file
 			*datapointer = NULL;
 			return false;
 		}
-		data++;
 	}
 
-	// check if it's a comment
-	if (c == '/')
+	if (data[0] == '/' && data[1] == '/')
 	{
-		// skip // comments
-		if (data[1] == '/')
-		{
-			while (*data && *data != '\n')
-				data++;
-			goto skipwhite;
-		}
-		// skip /* comments
-		if (data[1] == '*')
-		{
-			while (*data && (*data != '*' || data[1] != '/'))
-				data++;
-			data+=2;
-			goto skipwhite;
-		}
+		// comment
+		while (*data && *data != '\n')
+			data++;
+		goto skipwhite;
 	}
-
-// handle quoted strings specially
-	if (c == '\"')
+	else if (data[0] == '/' && data[1] == '*')
 	{
+		// comment
 		data++;
-		while (1)
+		while (*data && (data[0] != '*' || data[1] != '/'))
+			data++;
+		data += 2;
+		goto skipwhite;
+	}
+	else if (*data == '\"')
+	{
+		// quoted string
+		for (data++;*data != '\"';data++)
 		{
-			c = *data++;
-			if (c == '\"' || !c)
+			if (!*data || len >= (int)sizeof(com_token) - 1)
 			{
-				com_token[len] = 0;
-				*datapointer = data;
-				return true;
+				com_token[0] = 0;
+				*datapointer = NULL;
+				return false;
 			}
-			com_token[len] = c;
-			len++;
+			com_token[len++] = *data;
 		}
+		com_token[len] = 0;
+		*datapointer = data+1;
+		return true;
 	}
-
-// parse single characters
-	if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';' || c == '\n')
+	else if (*data == '\n' || *data == '{' || *data == '}' || *data == ')' || *data == '(' || *data == ']' || *data == '[' || *data == '\'' || *data == ':' || *data == ',' || *data == ';')
 	{
-		com_token[len] = c;
-		len++;
+		// single character
+		com_token[len++] = *data++;
 		com_token[len] = 0;
-		*datapointer = data+1;
+		*datapointer = data;
 		return true;
 	}
-
-// parse a regular word
-	do
+	else
 	{
-		com_token[len] = c;
-		data++;
-		len++;
-		c = *data;
-		if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';')
-			break;
-	} while (c>32);
-
-	com_token[len] = 0;
-	*datapointer = data;
-	return true;
+		// regular word
+		for (;*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;
+	}
 }
 
 /*
@@ -607,7 +587,6 @@ Parse a token out of a string, behaving like the qwcl console
 */
 int COM_ParseTokenConsole(const char **datapointer)
 {
-	int c;
 	int len;
 	const char *data = *datapointer;
 
@@ -622,55 +601,57 @@ int COM_ParseTokenConsole(const char **datapointer)
 
 // skip whitespace
 skipwhite:
-	while ((c = *data) <= ' ')
+	for (;*data <= ' ';data++)
 	{
-		if (c == 0)
+		if (*data == 0)
 		{
 			// end of file
 			*datapointer = NULL;
 			return false;
 		}
-		data++;
 	}
 
-	// skip // comments
-	if (c == '/' && data[1] == '/')
+	if (*data == '/' && data[1] == '/')
 	{
+		// comment
 		while (*data && *data != '\n')
 			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;
-				*datapointer = data;
-				return true;
+				com_token[0] = 0;
+				*datapointer = NULL;
+				return false;
 			}
-			com_token[len] = c;
-			len++;
+			com_token[len++] = *data;
 		}
+		com_token[len] = 0;
+		*datapointer = data+1;
+		return true;
 	}
-
-// parse a regular word
-	do
+	else
 	{
-		com_token[len] = c;
-		data++;
-		len++;
-		c = *data;
-	} while (c>32);
-
-	com_token[len] = 0;
-	*datapointer = data;
-	return true;
+		// 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;
+		*datapointer = data;
+		return true;
+	}
 }
 
 
@@ -776,6 +757,10 @@ void COM_InitGameType (void)
 		gamemode = GAME_FNIGGIUM;
 	else if (strstr(name, "setheral"))
 		gamemode = GAME_SETHERAL;
+	else if (strstr(name, "som"))
+		gamemode = GAME_SOM;
+	else if (strstr(name, "tenebrae"))
+		gamemode = GAME_TENEBRAE;
 	else
 		gamemode = GAME_NORMAL;
 
@@ -803,6 +788,10 @@ void COM_InitGameType (void)
 		gamemode = GAME_FNIGGIUM;
 	else if (COM_CheckParm ("-setheral"))
 		gamemode = GAME_SETHERAL;
+	else if (COM_CheckParm ("-som"))
+		gamemode = GAME_SOM;
+	else if (COM_CheckParm ("-tenebrae"))
+		gamemode = GAME_TENEBRAE;
 
 	switch(gamemode)
 	{
@@ -828,7 +817,7 @@ void COM_InitGameType (void)
 		break;
 	case GAME_TRANSFUSION:
 		gamename = "Transfusion";
-		gamedirname = "transfusion";
+		gamedirname = "basetf";
 		break;
 	case GAME_GOODVSBAD2:
 		gamename = "GoodVs.Bad2";
@@ -854,6 +843,14 @@ void COM_InitGameType (void)
 		gamename = "Setheral";
 		gamedirname = "data";
 		break;
+	case GAME_SOM:
+		gamename = "Son of Man";
+		gamedirname = "data";
+		break;
+	case GAME_TENEBRAE:
+		gamename = "DarkPlaces-Tenebrae";
+		gamedirname = "tenebrae";
+		break;
 	default:
 		Sys_Error("COM_InitGameType: unknown gamemode %i\n", gamemode);
 		break;
@@ -1120,9 +1117,7 @@ char *SearchInfostring(const char *infostring, const char *key)
 /*	$OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $	*/
 
 
-// Most (all?) BSDs already have them
-#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
-
+#ifndef HAVE_STRLCAT
 size_t
 strlcat(char *dst, const char *src, size_t siz)
 {
@@ -1150,7 +1145,10 @@ strlcat(char *dst, const char *src, size_t siz)
 
 	return(dlen + (s - src));	/* count does not include NUL */
 }
+#endif  // #ifndef HAVE_STRLCAT
+
 
+#ifndef HAVE_STRLCPY
 size_t
 strlcpy(char *dst, const char *src, size_t siz)
 {
@@ -1177,4 +1175,4 @@ strlcpy(char *dst, const char *src, size_t siz)
 	return(s - src - 1);	/* count does not include NUL */
 }
 
-#endif  // #if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+#endif  // #ifndef HAVE_STRLCPY