X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=inline;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=f8c960a4a9474b012fd7a4092263094935dbbfc2;hb=3ae8500149d8fabdaa032dfc2b2d61a41ba9ea6c;hp=7efa09be64eaa5fae7ca04b80297291a034f6cf7;hpb=6e6019db56b79c40578aba55b77000eb9599127f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 7efa09be6..f8c960a4a 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1,6 +1,5 @@
 #include "mapinfo.qh"
 #if defined(CSQC)
-    #include "../client/defs.qh"
     #include "util.qh"
     #include <common/weapons/_all.qh>
 #elif defined(MENUQC)
@@ -611,7 +610,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThis
 	}
 }
 
-Gametype MapInfo_Type_FromString(string gtype, bool dowarn)
+Gametype MapInfo_Type_FromString(string gtype, bool dowarn, bool is_q3compat)
 {
 	string replacement = "";
 	bool do_warn = true;
@@ -627,8 +626,8 @@ Gametype MapInfo_Type_FromString(string gtype, bool dowarn)
 		case "ffa": 	  replacement = "dm"; do_warn = false; break;
 		case "cctf":
 		case "oneflag":   replacement = "ctf"; do_warn = false; break;
-		case "team": 	  replacement = "tdm"; do_warn = false; break;
 		case "tourney":   replacement = "duel"; do_warn = false; break;
+		case "arena":     if(is_q3compat) { replacement = "ca"; do_warn = false; } break;
 	}
 	if (replacement != "")
 	{
@@ -899,9 +898,10 @@ bool _MapInfo_ParseArena(string arena_filename, int fh, string pFilename, Gamety
 			// if there is a valid gametype in this .arena file, include it in the menu
 			stored_supportedFeatures |= MAPINFO_FEATURE_WEAPONS;
 			// type in quake 3 holds all the supported gametypes, so we must loop through all of them
-			FOREACH_WORD(s, true,
+			string types = strreplace("team", "tdm ft", s); // TODO: handle support here better to include more Xonotic teamplay modes
+			FOREACH_WORD(types, true,
 			{
-				Gametype f = MapInfo_Type_FromString(it, false);
+				Gametype f = MapInfo_Type_FromString(it, false, true);
 				if(f)
 					stored_supportedGametypes |= f.m_flags;
 			});
@@ -1156,7 +1156,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 		else if(t == "type")
 		{
 			t = car(s); s = cdr(s);
-			Gametype f = MapInfo_Type_FromString(t, true);
+			Gametype f = MapInfo_Type_FromString(t, true, false);
 			//if(WARN_COND)
 				//LOG_WARN("Map ", pFilename, " contains the legacy 'type' keyword which is deprecated and will be removed in the future. Please migrate the mapinfo file to 'gametype'.");
 			if(f)
@@ -1167,7 +1167,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 		else if(t == "gametype")
 		{
 			t = car(s); s = cdr(s);
-			Gametype f = MapInfo_Type_FromString(t, true);
+			Gametype f = MapInfo_Type_FromString(t, true, false);
 			if(f)
 				_MapInfo_Map_ApplyGametypeEx (s, pGametypeToSet, f);
 			else if(WARN_COND)
@@ -1218,7 +1218,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 			t = car(s); s = cdr(s);
 			bool all = t == "all";
 			Gametype f = NULL;
-			if(all || (f = MapInfo_Type_FromString(t, true)))
+			if(all || (f = MapInfo_Type_FromString(t, true, false)))
 			{
 				if((all ? MAPINFO_TYPE_ALL : f.m_flags) & pGametypeToSet.m_flags)
 				{
@@ -1235,7 +1235,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 			t = car(s); s = cdr(s);
 			bool all = t == "all";
 			Gametype f = NULL;
-			if(all || (f = MapInfo_Type_FromString(t, true)))
+			if(all || (f = MapInfo_Type_FromString(t, true, false)))
 			{
 				if((all ? MAPINFO_TYPE_ALL : f.m_flags) & pGametypeToSet.m_flags)
 				{
@@ -1384,7 +1384,7 @@ int MapInfo_CurrentFeatures()
 
 Gametype MapInfo_CurrentGametype()
 {
-	Gametype prev = MapInfo_Type_FromString(cvar_string("gamecfg"), false);
+	Gametype prev = MapInfo_Type_FromString(cvar_string("gamecfg"), false, false);
 	FOREACH(Gametypes, cvar(it.netname) && it != prev, return it);
 	return prev ? prev : MAPINFO_TYPE_DEATHMATCH;
 }