[nexuiz-commits] r8465 - trunk/data/qcsrc/common

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-12-31 03:13:50 -0500 (Thu, 31 Dec 2009)
New Revision: 8465

Modified:
   trunk/data/qcsrc/common/mapinfo.qc
Log:
improve fallback code


Modified: trunk/data/qcsrc/common/mapinfo.qc
===================================================================
--- trunk/data/qcsrc/common/mapinfo.qc	2009-12-31 08:07:49 UTC (rev 8464)
+++ trunk/data/qcsrc/common/mapinfo.qc	2009-12-31 08:13:50 UTC (rev 8465)
@@ -994,11 +994,12 @@
 void MapInfo_LoadMap(string s)
 {
 	MapInfo_Map_supportedGametypes = 0;
-	if(!MapInfo_CheckMap(s))
-	{
-		print("EMERGENCY: can't play the selected map in the given game mode. Falling back to DM.\n");
-		MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH);
-	}
+	// we shouldn't need this, as LoadMapSettings already fixes the gametype
+	//if(!MapInfo_CheckMap(s))
+	//{
+	//	print("EMERGENCY: can't play the selected map in the given game mode. Falling back to DM.\n");
+	//	MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH);
+	//}
 	localcmd(strcat("\nsettemp_restore\nchangelevel ", s, "\n"));
 }
 
@@ -1023,7 +1024,10 @@
 	if(!_MapInfo_CheckMap(s)) // with underscore, it keeps temps
 	{
 		if(MapInfo_Map_supportedGametypes == 0)
+		{
 			print("Mapinfo system is not functional at all. Assuming deathmatch.\n");
+			MapInfo_Map_supportedGametypes = MAPINFO_TYPE_DEATHMATCH;
+		}
 
 		t = 1;
 		while(!(MapInfo_Map_supportedGametypes & 1))