X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=common.c;h=86d448b0b1ba9b50e4553557613422618ee56bf6;hb=004f001e96665b48ddc680d047573df0de594f95;hp=bfdb26ee0ee56f8f40886e9ad6e8f35420395392;hpb=598fddaa9633afd444cb95d8e7eb74d9b05b899d;p=xonotic%2Fdarkplaces.git

diff --git a/common.c b/common.c
index bfdb26ee..86d448b0 100644
--- a/common.c
+++ b/common.c
@@ -171,7 +171,7 @@ static unsigned short crctable[256] =
 	0x6e17,	0x7e36,	0x4e55,	0x5e74,	0x2e93,	0x3eb2,	0x0ed1,	0x1ef0
 };
 
-unsigned short CRC_Block(const qbyte *data, int size)
+unsigned short CRC_Block(const qbyte *data, size_t size)
 {
 	unsigned short crc = CRC_INIT_VALUE;
 	while (size--)
@@ -249,7 +249,7 @@ 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_WriteCoord13i (sizebuf_t *sb, float f)
@@ -783,7 +783,6 @@ skipwhite:
 		}
 		com_token[len] = 0;
 		*datapointer = data+1;
-		return true;
 	}
 	else
 	{
@@ -800,8 +799,9 @@ skipwhite:
 		}
 		com_token[len] = 0;
 		*datapointer = data;
-		return true;
 	}
+
+	return true;
 }
 
 
@@ -961,10 +961,10 @@ static const gamemode_info_t gamemode_info [] =
 // 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 Masters
-{ "netherworld",	"-netherworld",	"Dark Masters",			"id1",		"netherworld", 	"nw",			"darkplaces"},
+// COMMANDLINEOPTION: Game: -netherworld runs the game Netherworld: Dark Master
+{ "netherworld",	"-netherworld",	"Netherworld: Dark Master",	"id1",		"netherworld", 	"nw",			"darkplaces"},
 // GAME_THEHUNTED
-// COMMANDLINEOPTION: Game: -netherworld runs the game The Hunted
+// COMMANDLINEOPTION: Game: -thehunted runs the game The Hunted
 { "thehunted",		"-thehunted",	"The Hunted",			"thdata",	NULL, 			"th",			"thehunted"},
 };
 
@@ -1131,7 +1131,7 @@ int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *t
 	l = *text;
 	commentprefixlength = 0;
 	if (commentprefix)
-		commentprefixlength = strlen(commentprefix);
+		commentprefixlength = (int)strlen(commentprefix);
 	while (*l && *l != '\n' && *l != '\r')
 	{
 		if (*l > ' ')