X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=9dd02ca4c2955e25b1c1347343ee0a7e62d9a7b7;hb=616650bb18362024afeed71fed91d33dc1708d09;hp=923316652c34189247d927d52e4103840404b11b;hpb=4ae9864d4f73f516a2b58aec0c622020e859ee3d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 923316652..9dd02ca4c 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -472,8 +472,7 @@ void _MapInfo_Map_ApplyGametype(string s, float pWantedType, float pThisType, fl
 	{
 		sa = car(s);
 		if(sa != "")
-			if(cvar("g_ctf_win_mode") < 2)
-				cvar_set("fraglimit", sa);
+			cvar_set("fraglimit", sa);
 		s = cdr(s);
 	}
 
@@ -547,7 +546,6 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
 	string sa, k, v;
 	float p;
 	string fraglimit_normal;
-	string fraglimit_caps;
 	string fraglimit_teams;
 
 	MapInfo_Map_supportedGametypes |= pThisType;
@@ -565,7 +563,6 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
 	cvar_set("g_race_qualifying_timelimit", cvar_defstring("g_race_qualifying_timelimit"));
 
 	fraglimit_normal = string_null;
-	fraglimit_caps = string_null;
 	fraglimit_teams = string_null;
 
 	s = strcat(_MapInfo_GetDefaultEx(pWantedType), " ", s);
@@ -597,14 +594,10 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
 		{
 			cvar_set("leadlimit", v);
 		}
-		else if(k == "pointlimit" || k == "fraglimit" || k == "lives" || k == "laplimit")
+		else if(k == "pointlimit" || k == "fraglimit" || k == "lives" || k == "laplimit" || k == "caplimit")
 		{
 			fraglimit_normal = v;
 		}
-		else if(k == "caplimit")
-		{
-			fraglimit_caps = v;
-		}
 		else if(k == "teampointlimit" || k == "teamlaplimit")
 		{
 			fraglimit_teams = v;
@@ -629,12 +622,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
 		}
 	}
 
-	if(pWantedType == MAPINFO_TYPE_CTF && cvar("g_ctf_win_mode") < 2)
-	{
-		if(fraglimit_caps)
-			cvar_set("fraglimit", fraglimit_caps);
-	}
-	else if(pWantedType == MAPINFO_TYPE_RACE && cvar("g_race_teams") >= 2)
+	if(pWantedType == MAPINFO_TYPE_RACE && cvar("g_race_teams") >= 2)
 	{
 		if(fraglimit_teams)
 			cvar_set("fraglimit", fraglimit_teams);
@@ -649,6 +637,24 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
 float MapInfo_Type_FromString(string t)
 {
 	entity e;
+	if(t == "nexball")
+	{
+		print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+		t = "nb";
+		print("'. Should use '", t, "'.\n");
+	}
+	if(t == "freezetag")
+	{
+		print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+		t = "ft";
+		print("'. Should use '", t, "'.\n");
+	}
+	if(t == "keepaway")
+	{
+		print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+		t = "ka";
+		print("'. Should use '", t, "'.\n");
+	}
 	if(t == "all")
 		return MAPINFO_TYPE_ALL;
 	for(e = MapInfo_Type_first; e; e = e.enemy)