From: Samual Lenks <samual@xonotic.org>
Date: Sun, 26 Jan 2014 19:35:28 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into samual/combined_updates
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~26
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=3f6354bf7f3019a80e13ca7536b9300226dd86fb;hp=a3ef9212641f70e112e5521ad5d4eb9f5fd84a67;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into samual/combined_updates
---

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 27b2b72f9..8af5b49fc 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -611,14 +611,11 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
 		p = strstrofs(sa, "=", 0);
 		if(p < 0)
 		{
-			k = "timelimit";
-			v = s;
-		}
-		else
-		{
-			k = substring(sa, 0, p);
-			v = substring(sa, p+1, -1);
+			print("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
+			continue;
 		}
+		k = substring(sa, 0, p);
+		v = substring(sa, p+1, -1);
 
 		if(k == "timelimit")
 		{
@@ -654,7 +651,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
 		}
 		else
 		{
-			print("Invalid gametype key in mapinfo: ", k, "\n");
+			print("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
 		}
 	}