X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=f3213527ba48167611a8f842e45af3738e9dad85;hb=06ac66a5edaa645e19ed9a6482409e8656a65b1d;hp=56dcce489cfa9fad4275d0e077a9cf8c16c6a85f;hpb=f41d9f31538bef0259d2b2c74536bb977901f99d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 56dcce489..f3213527b 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1,20 +1,14 @@
+#include "mapinfo.qh"
 #if defined(CSQC)
     #include "../client/defs.qh"
     #include "util.qh"
-    #include <common/weapons/all.qh>
-    #include "mapinfo.qh"
+    #include <common/weapons/_all.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
     #include "util.qh"
     #include <common/monsters/all.qh>
-    #include "mapinfo.qh"
 #endif
 
-bool autocvar_developer_mapper;
-
-#define LOG_MAPWARN(...) MACRO_BEGIN { if (autocvar_developer_mapper) LOG_WARNING(__VA_ARGS__); } MACRO_END
-#define LOG_MAPWARNF(...) MACRO_BEGIN { if (autocvar_developer_mapper) LOG_WARNINGF(__VA_ARGS__); } MACRO_END
-
 // generic string stuff
 
 int _MapInfo_Cache_Active;
@@ -155,7 +149,11 @@ float _MapInfo_FilterList_cmp(float i, float j, entity pass)
 	return strcasecmp(a, b);
 }
 
-float MapInfo_FilterGametype(int pGametype, int pFeatures, int pFlagsRequired, int pFlagsForbidden, bool pAbortOnGenerate)
+float MapInfo_FilterGametype(Gametype pGametype, int pFeatures, int pFlagsRequired, int pFlagsForbidden, bool pAbortOnGenerate)
+{
+	return _MapInfo_FilterGametype(pGametype.m_flags, pFeatures, pFlagsRequired, pFlagsForbidden, pAbortOnGenerate);
+}
+float _MapInfo_FilterGametype(int pGametype, int pFeatures, int pFlagsRequired, int pFlagsForbidden, bool pAbortOnGenerate)
 {
 	float i, j;
 	if (!_MapInfo_filtered_allocated)
@@ -166,10 +164,10 @@ float MapInfo_FilterGametype(int pGametype, int pFeatures, int pFlagsRequired, i
 	MapInfo_count = 0;
 	for(i = 0, j = -1; i < _MapInfo_globcount; ++i)
 	{
-		if(MapInfo_Get_ByName(_MapInfo_GlobItem(i), 1, 0) == 2) // if we generated one... BAIL OUT and let the caller continue in the next frame.
+		if(MapInfo_Get_ByName(_MapInfo_GlobItem(i), 1, NULL) == 2) // if we generated one... BAIL OUT and let the caller continue in the next frame.
 			if(pAbortOnGenerate)
 			{
-				LOG_TRACE("Autogenerated a .mapinfo, doing the rest later.\n");
+				LOG_TRACE("Autogenerated a .mapinfo, doing the rest later.");
 				MapInfo_progress = i / _MapInfo_globcount;
 				return 0;
 			}
@@ -183,7 +181,7 @@ float MapInfo_FilterGametype(int pGametype, int pFeatures, int pFlagsRequired, i
 	MapInfo_ClearTemps();
 
 	// sometimes the glob isn't sorted nicely, so fix it here...
-	heapsort(MapInfo_count, _MapInfo_FilterList_swap, _MapInfo_FilterList_cmp, world);
+	heapsort(MapInfo_count, _MapInfo_FilterList_swap, _MapInfo_FilterList_cmp, NULL);
 
 	return 1;
 }
@@ -211,7 +209,7 @@ void MapInfo_FilterString(string sf)
 	MapInfo_ClearTemps();
 
 	// sometimes the glob isn't sorted nicely, so fix it here...
-	heapsort(MapInfo_count, _MapInfo_FilterList_swap, _MapInfo_FilterList_cmp, world);
+	heapsort(MapInfo_count, _MapInfo_FilterList_swap, _MapInfo_FilterList_cmp, NULL);
 }
 
 void MapInfo_Filter_Free()
@@ -254,7 +252,7 @@ string unquote(string s)
 
 float MapInfo_Get_ByID(float i)
 {
-	if(MapInfo_Get_ByName(MapInfo_BSPName_ByID(i), 0, 0))
+	if(MapInfo_Get_ByName(MapInfo_BSPName_ByID(i), 0, NULL))
 		return 1;
 	return 0;
 }
@@ -270,7 +268,6 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 	float i;
 	float inWorldspawn;
 	float r;
-	float twoBaseModes;
 	float diameter, spawnpoints;
 	float spawnplaces;
 
@@ -350,21 +347,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 			}
 			else if(k == "classname")
 			{
-				if(v == "dom_controlpoint")
-					MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_DOMINATION;
-				else if(v == "item_flag_team2")
-					MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CTF;
-				else if(v == "team_CTF_blueflag")
-					MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CTF;
-				else if(v == "invasion_spawnpoint")
-					MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_INVASION;
-				else if(v == "target_assault_roundend")
-					MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_ASSAULT;
-				else if(v == "onslaught_generator")
-					MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_ONSLAUGHT;
-				else if(substring(v, 0, 8) == "nexball_" || substring(v, 0, 4) == "ball")
-					MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_NEXBALL;
-				else if(v == "info_player_team1")
+				if(v == "info_player_team1")
 					++spawnpoints;
 				else if(v == "info_player_team2")
 					++spawnpoints;
@@ -372,10 +355,6 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 					++spawnpoints;
 				else if(v == "info_player_deathmatch")
 					++spawnpoints;
-				else if(v == "trigger_race_checkpoint")
-					MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_RACE;
-				else if(v == "target_startTimer")
-					MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CTS;
 				else if(v == "weapon_nex")
 					{ }
 				else if(v == "weapon_railgun")
@@ -390,6 +369,8 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 					MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_MONSTERS;
 				else if(v == "target_music" || v == "trigger_music")
 					_MapInfo_Map_worldspawn_music = string_null; // don't use regular BGM
+				else
+					FOREACH(Gametypes, true, it.m_generate_mapinfo(it, v));
 			}
 		}
 	}
@@ -400,37 +381,27 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 	}
 	diameter = vlen(mapMaxs - mapMins);
 
-	twoBaseModes = MapInfo_Map_supportedGametypes & (MAPINFO_TYPE_CTF | MAPINFO_TYPE_ASSAULT | MAPINFO_TYPE_RACE | MAPINFO_TYPE_NEXBALL);
-	if(twoBaseModes && (MapInfo_Map_supportedGametypes == twoBaseModes))
+	int twoBaseModes = 0;
+	FOREACH(Gametypes, it.m_isTwoBaseMode(), twoBaseModes |= it.m_flags);
+	if(twoBaseModes && (twoBaseModes &= MapInfo_Map_supportedGametypes))
 	{
-		// we have a CTF-only or Assault-only map. Don't add other modes then,
-		// as the map is too symmetric for them.
+		// we have a symmetrical map, don't add the modes without bases
 	}
 	else
 	{
-		MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_DEATHMATCH;      // DM always works
-		MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_LMS;             // LMS always works
-		MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_KEEPAWAY;		// Keepaway always works
-
-		if(spawnpoints >= 8  && diameter > 4096) {
-			MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_TEAM_DEATHMATCH;
-			MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_FREEZETAG;
-			MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CA;
-		}
-		if(spawnpoints >= 12 && diameter > 5120)
-			MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_KEYHUNT;
+		FOREACH(Gametypes, it.m_isAlwaysSupported(it, spawnpoints, diameter), MapInfo_Map_supportedGametypes |= it.m_flags);
 	}
 
-	if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_RACE)
+	if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_RACE.m_flags)
 	if(!spawnplaces)
 	{
-		MapInfo_Map_supportedGametypes &= ~MAPINFO_TYPE_RACE;
-		MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CTS;
+		MapInfo_Map_supportedGametypes &= ~MAPINFO_TYPE_RACE.m_flags;
+		MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CTS.m_flags;
 	}
 
 	LOG_TRACE("-> diameter ",    ftos(diameter));
 	LOG_TRACE(";  spawnpoints ", ftos(spawnpoints));
-	LOG_TRACE(";  modes ",       ftos(MapInfo_Map_supportedGametypes), "\n");
+	LOG_TRACE(";  modes ",       ftos(MapInfo_Map_supportedGametypes));
 
 	fclose(fh);
 
@@ -452,7 +423,7 @@ void _MapInfo_Map_Reset()
 	MapInfo_Map_maxs = '0 0 0';
 }
 
-string _MapInfo_GetDefault(float t)
+string _MapInfo_GetDefault(Gametype t)
 {
 	switch(t)
 	{
@@ -477,11 +448,11 @@ string _MapInfo_GetDefault(float t)
 	}
 }
 
-void _MapInfo_Map_ApplyGametype(string s, int pWantedType, int pThisType, int load_default)
+void _MapInfo_Map_ApplyGametype(string s, Gametype pWantedType, Gametype pThisType, int load_default)
 {
 	string sa;
-	MapInfo_Map_supportedGametypes |= pThisType;
-	if(!(pThisType & pWantedType))
+	MapInfo_Map_supportedGametypes |= pThisType.m_flags;
+	if(!(pThisType.m_flags & pWantedType.m_flags))
 		return;
 
 	if(load_default)
@@ -504,55 +475,13 @@ void _MapInfo_Map_ApplyGametype(string s, int pWantedType, int pThisType, int lo
 		cvar_set("timelimit", sa);
 	s = cdr(s);
 
-	if(pWantedType == MAPINFO_TYPE_TEAM_DEATHMATCH)
-	{
-		sa = car(s);
-		if(sa != "")
-			cvar_set("g_tdm_teams", sa);
-		s = cdr(s);
-	}
-
-	if(pWantedType == MAPINFO_TYPE_KEYHUNT)
-	{
-		sa = car(s);
-		if(sa != "")
-			cvar_set("g_keyhunt_teams", sa);
-		s = cdr(s);
-	}
-
-	if(pWantedType == MAPINFO_TYPE_CA)
-	{
-		sa = car(s);
-		if(sa != "")
-			cvar_set("g_ca_teams", sa);
-		s = cdr(s);
-	}
-
-	if(pWantedType == MAPINFO_TYPE_FREEZETAG)
-	{
-		sa = car(s);
-		if(sa != "")
-			cvar_set("g_freezetag_teams", sa);
-		s = cdr(s);
-	}
-
-	if(pWantedType == MAPINFO_TYPE_CTF)
-	{
-		sa = car(s);
-		if(sa != "")
-			cvar_set("fraglimit", sa);
-		s = cdr(s);
-	}
-
-	/* keepaway wuz here
-	if(pWantedType == MAPINFO_TYPE_KEEPAWAY)
+	if(pWantedType.m_setTeams)
 	{
 		sa = car(s);
 		if(sa != "")
-			cvar_set("fraglimit", sa);
+			pWantedType.m_setTeams(sa);
 		s = cdr(s);
 	}
-	*/
 
 	// rc = timelimit timelimit_qualification laps laps_teamplay
 	if(pWantedType == MAPINFO_TYPE_RACE)
@@ -574,19 +503,6 @@ void _MapInfo_Map_ApplyGametype(string s, int pWantedType, int pThisType, int lo
 		s = cdr(s);
 	}
 
-	if(pWantedType == MAPINFO_TYPE_CTS)
-	{
-		sa = car(s);
-
-		// this is the skill of the map
-		// not parsed by anything yet
-		// for map databases
-		//if(sa != "")
-		//	cvar_set("fraglimit", sa);
-
-		s = cdr(s);
-	}
-
 	if(pWantedType == MAPINFO_TYPE_ASSAULT || pWantedType == MAPINFO_TYPE_ONSLAUGHT || pWantedType == MAPINFO_TYPE_CTS) // these modes don't use fraglimit
 	{
 		cvar_set("leadlimit", "0");
@@ -600,22 +516,20 @@ void _MapInfo_Map_ApplyGametype(string s, int pWantedType, int pThisType, int lo
 	}
 }
 
-string _MapInfo_GetDefaultEx(float t)
+string _MapInfo_GetDefaultEx(Gametype t)
 {
-	FOREACH(Gametypes, it.items == t, LAMBDA(return it.model2));
-	return "";
+	return t ? t.model2 : "";
 }
 
-float _MapInfo_GetTeamPlayBool(float t)
+float _MapInfo_GetTeamPlayBool(Gametype t)
 {
-	FOREACH(Gametypes, it.items == t, LAMBDA(return it.team));
-	return false;
+	return t ? t.team : false;
 }
 
-void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType)
+void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThisType)
 {
-	MapInfo_Map_supportedGametypes |= pThisType;
-	if (!(pThisType & pWantedType))
+	MapInfo_Map_supportedGametypes |= pThisType.m_flags;
+	if (!(pThisType.m_flags & pWantedType.m_flags))
 		return;
 
 	// reset all the cvars to their defaults
@@ -623,7 +537,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType)
 	cvar_set("timelimit", cvar_defstring("timelimit"));
 	cvar_set("leadlimit", cvar_defstring("leadlimit"));
 	cvar_set("fraglimit", cvar_defstring("fraglimit"));
-	FOREACH(Gametypes, true, LAMBDA(it.m_parse_mapinfo(string_null, string_null)));
+	FOREACH(Gametypes, true, it.m_parse_mapinfo(string_null, string_null));
 
 	string fraglimit_normal = string_null;
 	string fraglimit_teams = string_null;
@@ -671,7 +585,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType)
 			    break;
 			}
 		}
-		FOREACH(Gametypes, true, LAMBDA(handled |= it.m_parse_mapinfo(k, v)));
+		FOREACH(Gametypes, true, handled |= it.m_parse_mapinfo(k, v));
 		if (!handled)
             LOG_MAPWARNF("Invalid gametype setting in mapinfo for gametype %s: %s\n", MapInfo_Type_ToString(pWantedType), sa);
 	}
@@ -688,13 +602,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType)
 	}
 }
 
-Gametype MapInfo_Type(int t)
-{
-	FOREACH(Gametypes, it.items == t, LAMBDA(return it));
-	return NULL;
-}
-
-int MapInfo_Type_FromString(string t)
+Gametype MapInfo_Type_FromString(string t)
 {
 #define deprecate(from, to) MACRO_BEGIN { \
 	if (t == #from) { \
@@ -709,31 +617,25 @@ int MapInfo_Type_FromString(string t)
 	deprecate(invasion, inv);
 	deprecate(assault, as);
 	deprecate(race, rc);
-	if (t == "all") return MAPINFO_TYPE_ALL;
-	FOREACH(Gametypes, it.mdl == t, LAMBDA(return it.items));
-	return 0;
+	FOREACH(Gametypes, it.mdl == t, return it);
+	return NULL;
 #undef deprecate
 }
 
-string MapInfo_Type_Description(float t)
+string MapInfo_Type_Description(Gametype t)
 {
-	FOREACH(Gametypes, it.items == t, LAMBDA(return it.gametype_description));
-	return "";
+	return t ? t.gametype_description : "";
 }
 
-string MapInfo_Type_ToString(float t)
+string MapInfo_Type_ToString(Gametype t)
 {
-	if(t == MAPINFO_TYPE_ALL)
-	 	return "all";
-	FOREACH(Gametypes, it.items == t, LAMBDA(return it.mdl));
-	return "";
+	return t ? t.mdl : "";
 }
 
-string MapInfo_Type_ToText(float t)
+string MapInfo_Type_ToText(Gametype t)
 {
-	FOREACH(Gametypes, it.items == t, LAMBDA(return it.message));
 	/* xgettext:no-c-format */
-	return _("@!#%'n Tuba Throwing");
+	return t ? t.message : _("@!#%'n Tuba Throwing");
 }
 
 void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s, float recurse)
@@ -820,7 +722,7 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s,
 	{
 		if(type == 0) // server set
 		{
-			LOG_TRACE("Applying temporary setting ", t, " := ", s, "\n");
+			LOG_TRACE("Applying temporary setting ", t, " := ", s);
 			if(cvar("g_campaign"))
 				cvar_set(t, s); // this is a wrapper and is always temporary anyway; no need to backup old values then
 			else
@@ -828,7 +730,7 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s,
 		}
 		else
 		{
-			LOG_TRACE("Applying temporary client setting ", t, " := ", s, "\n");
+			LOG_TRACE("Applying temporary client setting ", t, " := ", s);
 			MapInfo_Map_clientstuff = strcat(
 					MapInfo_Map_clientstuff, "cl_cmd settemp \"", t, "\" \"", s, "\"\n"
 					);
@@ -862,7 +764,7 @@ float MapInfo_isRedundant(string fn, string t)
 }
 
 // load info about a map by name into the MapInfo_Map_* globals
-float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int pGametypeToSet)
+float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gametype pGametypeToSet)
 {
 	string fn;
 	string s, t;
@@ -879,7 +781,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 		return 0;
 	}
 
-	if(pGametypeToSet == 0)
+	if(pGametypeToSet == NULL)
 		if(MapInfo_Cache_Retrieve(pFilename))
 			return 1;
 
@@ -944,9 +846,9 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 			if(MapInfo_Map_flags & MAPINFO_FLAG_FRUSTRATING)
 				fputs(fh, "frustrating\n");
 
-			for(i = 1; i <= MapInfo_Map_supportedGametypes; i *= 2)
-				if(MapInfo_Map_supportedGametypes & i)
-					fputs(fh, sprintf("gametype %s // defaults: %s\n", MapInfo_Type_ToString(i), _MapInfo_GetDefaultEx(i)));
+			FOREACH(Gametypes, MapInfo_Map_supportedGametypes & it.m_flags, {
+				fputs(fh, sprintf("gametype %s // defaults: %s\n", MapInfo_Type_ToString(it), _MapInfo_GetDefaultEx(it)));
+			});
 
 			if(fexists(strcat("scripts/", pFilename, ".arena")))
 				fputs(fh, "settemp_for_type all sv_q3acompat_machineshotgunswap 1\n");
@@ -1030,7 +932,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 		else if(t == "type")
 		{
 			t = car(s); s = cdr(s);
-			f = MapInfo_Type_FromString(t);
+			Gametype f = MapInfo_Type_FromString(t);
 			LOG_MAPWARN("Map ", pFilename, " contains the legacy 'type' keyword which is deprecated and will be removed in the future. Please migrate the mapinfo file to 'gametype'.\n");
 			if(f)
 				_MapInfo_Map_ApplyGametype (s, pGametypeToSet, f, true);
@@ -1040,7 +942,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 		else if(t == "gametype")
 		{
 			t = car(s); s = cdr(s);
-			f = MapInfo_Type_FromString(t);
+			Gametype f = MapInfo_Type_FromString(t);
 			if(f)
 				_MapInfo_Map_ApplyGametypeEx (s, pGametypeToSet, f);
 			else
@@ -1080,9 +982,10 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 		else if(t == "settemp_for_type")
 		{
 			t = car(s); s = cdr(s);
+			Gametype f;
 			if((f = MapInfo_Type_FromString(t)))
 			{
-				if(f & pGametypeToSet)
+				if(f.m_flags & pGametypeToSet.m_flags)
 				{
 					_MapInfo_Parse_Settemp(pFilename, acl, 0, s, 1);
 				}
@@ -1095,9 +998,10 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 		else if(t == "clientsettemp_for_type")
 		{
 			t = car(s); s = cdr(s);
+			Gametype f;
 			if((f = MapInfo_Type_FromString(t)))
 			{
-				if(f & pGametypeToSet)
+				if(f.m_flags & pGametypeToSet.m_flags)
 				{
 					_MapInfo_Parse_Settemp(pFilename, acl, 1, s, 1);
 				}
@@ -1151,21 +1055,21 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 	LOG_MAPWARN("Map ", pFilename, " supports no game types, ignored\n");
 	return 0;
 }
-float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, int pGametypeToSet)
+int MapInfo_Get_ByName(string pFilename, float pAllowGenerate, Gametype pGametypeToSet)
 {
-	float r = MapInfo_Get_ByName_NoFallbacks(pFilename, pAllowGenerate, pGametypeToSet);
+	int r = MapInfo_Get_ByName_NoFallbacks(pFilename, pAllowGenerate, pGametypeToSet);
 
 	if(cvar("g_tdm_on_dm_maps"))
 	{
 		// if this is set, all DM maps support TDM too
-		if (!(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_TEAM_DEATHMATCH))
-			if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DEATHMATCH)
+		if (!(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_TEAM_DEATHMATCH.m_flags))
+			if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DEATHMATCH.m_flags)
 				_MapInfo_Map_ApplyGametypeEx ("", pGametypeToSet, MAPINFO_TYPE_TEAM_DEATHMATCH);
 	}
 
 	if(pGametypeToSet)
 	{
-		if(!(MapInfo_Map_supportedGametypes & pGametypeToSet))
+		if(!(MapInfo_Map_supportedGametypes & pGametypeToSet.m_flags))
 		{
 			error("Can't select the requested game type. This should never happen as the caller should prevent it!\n");
 			//_MapInfo_Map_ApplyGametypeEx("", pGametypeToSet, MAPINFO_TYPE_DEATHMATCH);
@@ -1238,19 +1142,18 @@ int MapInfo_CurrentFeatures()
 	return req;
 }
 
-int MapInfo_CurrentGametype()
+Gametype MapInfo_CurrentGametype()
 {
-	int prev = cvar("gamecfg");
-	FOREACH(Gametypes, cvar(it.netname) && it.items != prev, LAMBDA(return it.items));
-	if (prev) return prev;
-	return MAPINFO_TYPE_DEATHMATCH;
+	Gametype prev = Gametypes_from(cvar("gamecfg"));
+	FOREACH(Gametypes, cvar(it.netname) && it != prev, return it);
+	return prev ? prev : MAPINFO_TYPE_DEATHMATCH;
 }
 
 float _MapInfo_CheckMap(string s) // returns 0 if the map can't be played with the current settings, 1 otherwise
 {
-	if(!MapInfo_Get_ByName(s, 1, 0))
+	if(!MapInfo_Get_ByName(s, 1, NULL))
 		return 0;
-	if((MapInfo_Map_supportedGametypes & MapInfo_CurrentGametype()) == 0)
+	if((MapInfo_Map_supportedGametypes & MapInfo_CurrentGametype().m_flags) == 0)
 		return 0;
 	if((MapInfo_Map_supportedFeatures & MapInfo_CurrentFeatures()) != MapInfo_CurrentFeatures())
 		return 0;
@@ -1265,11 +1168,9 @@ float MapInfo_CheckMap(string s) // returns 0 if the map can't be played with th
 	return r;
 }
 
-void MapInfo_SwitchGameType(int t)
+void MapInfo_SwitchGameType(Gametype t)
 {
-	FOREACH(Gametypes, true, LAMBDA(
-		cvar_set(it.netname, (it.items == t) ? "1" : "0")
-	));
+	FOREACH(Gametypes, true, cvar_set(it.netname, (it == t) ? "1" : "0"));
 }
 
 void MapInfo_LoadMap(string s, float reinit)
@@ -1279,7 +1180,7 @@ void MapInfo_LoadMap(string s, float reinit)
 	//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);
+	//	MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH.m_flags);
 	//}
 
 	cvar_settemp_restore();
@@ -1289,7 +1190,7 @@ void MapInfo_LoadMap(string s, float reinit)
 		localcmd(strcat("\nchangelevel ", s, "\n"));
 }
 
-string MapInfo_ListAllowedMaps(float type, float pRequiredFlags, float pForbiddenFlags)
+string MapInfo_ListAllowedMaps(Gametype type, float pRequiredFlags, float pForbiddenFlags)
 {
 	string out;
 	float i;
@@ -1311,7 +1212,7 @@ string MapInfo_ListAllAllowedMaps(float pRequiredFlags, float pForbiddenFlags)
 
 	// to make absolutely sure:
 	MapInfo_Enumerate();
-	MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, pRequiredFlags, pForbiddenFlags, 0);
+	_MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, pRequiredFlags, pForbiddenFlags, 0);
 
 	out = "";
 	for(i = 0; i < MapInfo_count; ++i)
@@ -1322,47 +1223,46 @@ string MapInfo_ListAllAllowedMaps(float pRequiredFlags, float pForbiddenFlags)
 	return substring(out, 1, strlen(out) - 1);
 }
 
-void MapInfo_LoadMapSettings_SaveGameType(float t)
+void MapInfo_LoadMapSettings_SaveGameType(Gametype t)
 {
 	MapInfo_SwitchGameType(t);
-	cvar_set("gamecfg", ftos(t));
+	cvar_set("gamecfg", ftos(t.m_id));
 	MapInfo_LoadedGametype = t;
 }
 
 void MapInfo_LoadMapSettings(string s) // to be called from worldspawn
 {
-	float t;
-
-	t = MapInfo_CurrentGametype();
+	Gametype t = MapInfo_CurrentGametype();
 	MapInfo_LoadMapSettings_SaveGameType(t);
 
 	if(!_MapInfo_CheckMap(s)) // with underscore, it keeps temps
 	{
 		if(cvar("g_mapinfo_allow_unsupported_modes_and_let_stuff_break"))
 		{
-			LOG_SEVERE("can't play the selected map in the given game mode. Working with only the override settings.\n");
+			LOG_SEVERE("can't play the selected map in the given game mode. Working with only the override settings.");
 			_MapInfo_Map_ApplyGametypeEx("", t, t);
 			return; // do not call Get_ByName!
 		}
 
 		if(MapInfo_Map_supportedGametypes == 0)
 		{
-			LOG_SEVERE("Mapinfo system is not functional at all. Assuming deathmatch.\n");
-			MapInfo_Map_supportedGametypes = MAPINFO_TYPE_DEATHMATCH;
+			LOG_SEVERE("Mapinfo system is not functional at all. Assuming deathmatch.");
+			MapInfo_Map_supportedGametypes = MAPINFO_TYPE_DEATHMATCH.m_flags;
 			MapInfo_LoadMapSettings_SaveGameType(MAPINFO_TYPE_DEATHMATCH);
 			_MapInfo_Map_ApplyGametypeEx("", MAPINFO_TYPE_DEATHMATCH, MAPINFO_TYPE_DEATHMATCH);
 			return; // do not call Get_ByName!
 		}
 
-		t = 1;
+		int _t = 1;
 		while(!(MapInfo_Map_supportedGametypes & 1))
 		{
-			t *= 2;
-			MapInfo_Map_supportedGametypes = floor(MapInfo_Map_supportedGametypes / 2);
+			_t <<= 1;
+			MapInfo_Map_supportedGametypes = floor(MapInfo_Map_supportedGametypes >> 1);
 		}
+		FOREACH(Gametypes, it.m_flags == _t, { t = it; break; });
 
 		// t is now a supported mode!
-		LOG_WARNING("can't play the selected map in the given game mode. Falling back to a supported mode.\n");
+		LOG_WARN("can't play the selected map in the given game mode. Falling back to a supported mode.");
 		MapInfo_LoadMapSettings_SaveGameType(t);
 	}
 	MapInfo_Get_ByName(s, 1, t);
@@ -1397,7 +1297,7 @@ int MapInfo_ForbiddenFlags()
 {
 	int f = MAPINFO_FLAG_FORBIDDEN;
 
-#ifndef MENUQC
+#ifdef GAMEQC
 	if (!cvar("g_maplist_allow_hidden"))
 #endif
 		f |= MAPINFO_FLAG_HIDDEN;