X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=common.c;h=a10d08b7d078c778a83e1454fe4a775e5520a834;hb=384e311e7918416b4b72b05935b1343dd62fa8ed;hp=7ce4b548eb07e34e1fc647e26208349e2ade7244;hpb=43ee5e136a693ac9cfb40cb03fceea7d3149104f;p=xonotic%2Fdarkplaces.git

diff --git a/common.c b/common.c
index 7ce4b548..a10d08b7 100644
--- a/common.c
+++ b/common.c
@@ -36,8 +36,6 @@ mempool_t *pak_mempool;
 
 qboolean com_modified;   // set true if using non-id files
 
-qboolean msg_suppress_1 = 0;
-
 void COM_InitFilesystem (void);
 
 char com_token[1024];
@@ -52,6 +50,7 @@ char com_cmdline[CMDLINE_LENGTH];
 int gamemode;
 char *gamename;
 char *gamedirname;
+char com_modname[MAX_OSPATH];
 
 /*
 
@@ -376,7 +375,7 @@ char *MSG_ReadString (void)
 			break;
 		string[l] = c;
 		l++;
-	} while (l < sizeof(string)-1);
+	} while (l < (int)sizeof(string)-1);
 
 	string[l] = 0;
 
@@ -796,6 +795,8 @@ void COM_InitGameType (void)
 
 	if (strstr(name, "transfusion"))
 		gamemode = GAME_TRANSFUSION;
+	else if (strstr(name, "nexiuz"))
+		gamemode = GAME_NEXIUZ;
 	else if (strstr(name, "nehahra"))
 		gamemode = GAME_NEHAHRA;
 	else if (strstr(name, "hipnotic"))
@@ -807,6 +808,8 @@ void COM_InitGameType (void)
 
 	if (COM_CheckParm ("-transfusion"))
 		gamemode = GAME_TRANSFUSION;
+	else if (COM_CheckParm ("-nexiuz"))
+		gamemode = GAME_NEXIUZ;
 	else if (COM_CheckParm ("-nehahra"))
 		gamemode = GAME_NEHAHRA;
 	else if (COM_CheckParm ("-hipnotic"))
@@ -834,6 +837,10 @@ void COM_InitGameType (void)
 		gamename = "DarkPlaces-Nehahra";
 		gamedirname = "nehahra";
 		break;
+	case GAME_NEXIUZ:
+		gamename = "Nexiuz";
+		gamedirname = "data";
+		break;
 	case GAME_TRANSFUSION:
 		gamename = "Transfusion";
 		gamedirname = "transfusion";
@@ -1084,7 +1091,7 @@ void COM_CopyFile (char *netpath, char *cachepath)
 
 	while (remaining)
 	{
-		if (remaining < sizeof(buf))
+		if (remaining < (int)sizeof(buf))
 			count = remaining;
 		else
 			count = sizeof(buf);
@@ -1386,7 +1393,7 @@ void COM_AddGameDirectory (char *dir)
 	list = listdirectory(dir);
 	for (current = list;current;current = current->next)
 	{
-		if (matchpattern(current->text, "*.pak"))
+		if (matchpattern(current->text, "*.pak", true))
 		{
 			sprintf (pakfile, "%s/%s", dir, current->text);
 			pak = COM_LoadPackFile (pakfile);
@@ -1427,10 +1434,12 @@ void COM_InitFilesystem (void)
 		com_basedir[i-1] = 0;
 
 // start up with GAMENAME by default (id1)
+	strcpy(com_modname, GAMENAME);
 	COM_AddGameDirectory (va("%s/"GAMENAME, com_basedir));
 	if (gamedirname[0])
 	{
 		com_modified = true;
+		strcpy(com_modname, gamedirname);
 		COM_AddGameDirectory (va("%s/%s", com_basedir, gamedirname));
 	}
 
@@ -1440,6 +1449,7 @@ void COM_InitFilesystem (void)
 	if (i && i < com_argc-1)
 	{
 		com_modified = true;
+		strcpy(com_modname, com_argv[i+1]);
 		COM_AddGameDirectory (va("%s/%s", com_basedir, com_argv[i+1]));
 	}