X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=447e7730e205c9d2ecbff65f102886c41bca8118;hb=65f79cc103dac145eebf7c179a16408935c176b9;hp=2230d5c790385c0823b1184101395f4edf95396e;hpb=dc25d591f448c6ed191fcf9452d65b87d7a26e90;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 2230d5c79..447e7730e 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1,8 +1,20 @@
+#if defined(CSQC)
+    #include "../client/defs.qh"
+    #include "util.qh"
+    #include <common/weapons/all.qh>
+    #include "mapinfo.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+    #include "util.qh"
+    #include <common/monsters/all.qh>
+    #include "mapinfo.qh"
+#endif
+
 // generic string stuff
 
-float _MapInfo_Cache_Active;
-float _MapInfo_Cache_DB_NameToIndex;
-float _MapInfo_Cache_Buf_IndexToMapData;
+int _MapInfo_Cache_Active;
+int _MapInfo_Cache_DB_NameToIndex;
+int _MapInfo_Cache_Buf_IndexToMapData;
 
 void MapInfo_Cache_Destroy()
 {
@@ -103,7 +115,7 @@ void MapInfo_Enumerate()
 		_MapInfo_globopen = 0;
 	}
 	MapInfo_Cache_Invalidate();
-	_MapInfo_globhandle = search_begin("maps/*.bsp", TRUE, TRUE);
+	_MapInfo_globhandle = search_begin("maps/*.bsp", true, true);
 	if(_MapInfo_globhandle >= 0)
 	{
 		_MapInfo_globcount = search_getsize(_MapInfo_globhandle);
@@ -138,7 +150,7 @@ float _MapInfo_FilterList_cmp(float i, float j, entity pass)
 	return strcasecmp(a, b);
 }
 
-float MapInfo_FilterGametype(float pGametype, float pFeatures, float pFlagsRequired, float pFlagsForbidden, float pAbortOnGenerate)
+float MapInfo_FilterGametype(int pGametype, int pFeatures, int pFlagsRequired, int pFlagsForbidden, bool pAbortOnGenerate)
 {
 	float i, j;
 	if (!_MapInfo_filtered_allocated)
@@ -152,7 +164,7 @@ float MapInfo_FilterGametype(float pGametype, float pFeatures, float pFlagsRequi
 		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(pAbortOnGenerate)
 			{
-				dprint("Autogenerated a .mapinfo, doing the rest later.\n");
+				LOG_TRACE("Autogenerated a .mapinfo, doing the rest later.\n");
 				MapInfo_progress = i / _MapInfo_globcount;
 				return 0;
 			}
@@ -170,6 +182,32 @@ float MapInfo_FilterGametype(float pGametype, float pFeatures, float pFlagsRequi
 
 	return 1;
 }
+void MapInfo_FilterString(string sf)
+{
+	// this function further filters _MapInfo_filtered, which is prepared by MapInfo_FilterGametype by string
+	float i, j;
+	string title;
+
+	for(i = 0, j = -1; i < MapInfo_count; ++i)
+	{
+		if (MapInfo_Get_ByID(i))
+		{
+			// prepare for keyword filter
+			if (MapInfo_Map_title && strstrofs(MapInfo_Map_title, "<TITLE>", 0) == -1)
+				title = MapInfo_Map_title;
+			else
+				title = MapInfo_Map_bspname;
+			// keyword filter
+			if((strstrofs(strtolower(title), strtolower(sf), 0)) >= 0)
+				bufstr_set(_MapInfo_filtered, ++j, bufstr_get(_MapInfo_filtered, i));
+		}
+	}
+	MapInfo_count = j + 1;
+	MapInfo_ClearTemps();
+
+	// sometimes the glob isn't sorted nicely, so fix it here...
+	heapsort(MapInfo_count, _MapInfo_FilterList_swap, _MapInfo_FilterList_cmp, world);
+}
 
 void MapInfo_Filter_Free()
 {
@@ -244,7 +282,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 	}
 	if(fh < 0)
 		return 0;
-	print("Analyzing ", fn, " to generate initial mapinfo\n");
+	LOG_INFO("Analyzing ", fn, " to generate initial mapinfo\n");
 
 	inWorldspawn = 2;
 	MapInfo_Map_flags = 0;
@@ -255,7 +293,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 	mapMins = '0 0 0';
 	mapMaxs = '0 0 0';
 
-	for(;;)
+	for (;;)
 	{
 		if (!((s = fgets(fh))))
 			break;
@@ -293,12 +331,12 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 			if(k == "origin")
 			{
 				o = stov(strcat("'", v, "'"));
-				mapMins_x = min(mapMins_x, o_x);
-				mapMins_y = min(mapMins_y, o_y);
-				mapMins_z = min(mapMins_z, o_z);
-				mapMaxs_x = max(mapMaxs_x, o_x);
-				mapMaxs_y = max(mapMaxs_y, o_y);
-				mapMaxs_z = max(mapMaxs_z, o_z);
+				mapMins.x = min(mapMins.x, o.x);
+				mapMins.y = min(mapMins.y, o.y);
+				mapMins.z = min(mapMins.z, o.z);
+				mapMaxs.x = max(mapMaxs.x, o.x);
+				mapMaxs.y = max(mapMaxs.y, o.y);
+				mapMaxs.z = max(mapMaxs.z, o.z);
 			}
 			else if(k == "race_place")
 			{
@@ -352,7 +390,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 	}
 	if(inWorldspawn)
 	{
-		print(fn, " ended still in worldspawn, BUG\n");
+		LOG_MAPWARN(fn, " ended still in worldspawn, BUG\n");
 		return 0;
 	}
 	diameter = vlen(mapMaxs - mapMins);
@@ -385,9 +423,9 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 		MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CTS;
 	}
 
-	dprint("-> diameter ",    ftos(diameter));
-	dprint(";  spawnpoints ", ftos(spawnpoints));
-	dprint(";  modes ",       ftos(MapInfo_Map_supportedGametypes), "\n");
+	LOG_TRACE("-> diameter ",    ftos(diameter));
+	LOG_TRACE(";  spawnpoints ", ftos(spawnpoints));
+	LOG_TRACE(";  modes ",       ftos(MapInfo_Map_supportedGametypes), "\n");
 
 	fclose(fh);
 
@@ -434,7 +472,7 @@ string _MapInfo_GetDefault(float t)
 	}
 }
 
-void _MapInfo_Map_ApplyGametype(string s, float pWantedType, float pThisType, float load_default)
+void _MapInfo_Map_ApplyGametype(string s, int pWantedType, int pThisType, int load_default)
 {
 	string sa;
 	MapInfo_Map_supportedGametypes |= pThisType;
@@ -442,7 +480,7 @@ void _MapInfo_Map_ApplyGametype(string s, float pWantedType, float pThisType, fl
 		return;
 
 	if(load_default)
-		_MapInfo_Map_ApplyGametype(_MapInfo_GetDefault(pThisType), pWantedType, pThisType, FALSE);
+		_MapInfo_Map_ApplyGametype(_MapInfo_GetDefault(pThisType), pWantedType, pThisType, false);
 
 	if(pWantedType == MAPINFO_TYPE_ASSAULT || pWantedType == MAPINFO_TYPE_ONSLAUGHT || pWantedType == MAPINFO_TYPE_RACE || pWantedType == MAPINFO_TYPE_CTS) // these modes don't use fraglimit
 	{
@@ -559,31 +597,20 @@ void _MapInfo_Map_ApplyGametype(string s, float pWantedType, float pThisType, fl
 
 string _MapInfo_GetDefaultEx(float t)
 {
-	entity e;
-	for(e = MapInfo_Type_first; e; e = e.enemy)
-		if(t == e.items)
-			return e.model2;
+	FOREACH(Gametypes, it.items == t, return it.model2);
 	return "";
 }
 
 float _MapInfo_GetTeamPlayBool(float t)
 {
-	entity e;
-	for(e = MapInfo_Type_first; e; e = e.enemy)
-		if(t == e.items)
-			return e.team;
-	return FALSE;
+	FOREACH(Gametypes, it.items == t, return it.team);
+	return false;
 }
 
-void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
+void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType)
 {
-	string sa, k, v;
-	float p;
-	string fraglimit_normal;
-	string fraglimit_teams;
-
 	MapInfo_Map_supportedGametypes |= pThisType;
-	if(!(pThisType & pWantedType))
+	if (!(pThisType & pWantedType))
 		return;
 
 	// reset all the cvars to their defaults
@@ -591,74 +618,60 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
 	cvar_set("timelimit", cvar_defstring("timelimit"));
 	cvar_set("leadlimit", cvar_defstring("leadlimit"));
 	cvar_set("fraglimit", cvar_defstring("fraglimit"));
-	cvar_set("g_tdm_teams", cvar_defstring("g_tdm_teams"));
-	cvar_set("g_ca_teams", cvar_defstring("g_ca_teams"));
-	cvar_set("g_freezetag_teams", cvar_defstring("g_freezetag_teams"));
-	cvar_set("g_keyhunt_teams", cvar_defstring("g_keyhunt_teams"));
-	cvar_set("g_domination_default_teams", cvar_defstring("g_domination_default_teams"));
-	cvar_set("g_race_qualifying_timelimit", cvar_defstring("g_race_qualifying_timelimit"));
-
-	fraglimit_normal = string_null;
-	fraglimit_teams = string_null;
-
-	s = strcat(_MapInfo_GetDefaultEx(pWantedType), " ", s);
-	while(s != "")
-	{
-		sa = car(s);
-		s = cdr(s);
+	FOREACH(Gametypes, true, it.m_parse_mapinfo(string_null, string_null));
 
-		if(sa == "")
-			continue;
+	string fraglimit_normal = string_null;
+	string fraglimit_teams = string_null;
 
-		p = strstrofs(sa, "=", 0);
-		if(p < 0)
-		{
-			print("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
+	for (s = strcat(_MapInfo_GetDefaultEx(pWantedType), " ", s); s != ""; s = cdr(s)) {
+		string sa = car(s);
+		if (sa == "") continue;
+		int p = strstrofs(sa, "=", 0);
+		if (p < 0) {
+			LOG_MAPWARNF("Invalid gametype setting in mapinfo for gametype %s: %s\n", MapInfo_Type_ToString(pWantedType), sa);
 			continue;
 		}
-		k = substring(sa, 0, p);
-		v = substring(sa, p+1, -1);
-
-		if(k == "timelimit")
-		{
-			cvar_set("timelimit", v);
-		}
-		else if(k == "leadlimit")
-		{
-			cvar_set("leadlimit", v);
-		}
-		else if(k == "pointlimit" || k == "fraglimit" || k == "lives" || k == "laplimit" || k == "caplimit")
-		{
-			fraglimit_normal = v;
-		}
-		else if(k == "teampointlimit" || k == "teamlaplimit")
-		{
-			fraglimit_teams = v;
-		}
-		else if(k == "teams")
-		{
-			cvar_set("g_tdm_teams", v);
-			cvar_set("g_ca_teams", v);
-			cvar_set("g_freezetag_teams", v);
-			cvar_set("g_keyhunt_teams", v);
-			cvar_set("g_domination_default_teams", v);
-			cvar_set("g_invasion_teams", v);
-		}
-		else if(k == "qualifying_timelimit")
-		{
-			cvar_set("g_race_qualifying_timelimit", v);
-		}
-		else if(k == "skill")
-		{
-			// ignore
-		}
-		else
-		{
-			print("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
+		string k = substring(sa, 0, p);
+		string v = substring(sa, p + 1, -1);
+		bool handled = true;
+		switch (k) {
+			case "timelimit":
+			{
+				cvar_set("timelimit", v);
+				break;
+			}
+			case "leadlimit":
+			{
+				cvar_set("leadlimit", v);
+				break;
+			}
+			case "pointlimit":
+			case "fraglimit":
+			case "lives":
+			case "laplimit":
+			case "caplimit":
+			{
+				fraglimit_normal = v;
+				break;
+			}
+			case "teampointlimit":
+			case "teamlaplimit":
+			{
+				fraglimit_teams = v;
+				break;
+			}
+			default:
+			{
+			    handled = false;
+			    break;
+			}
 		}
+		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);
 	}
 
-	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);
@@ -670,79 +683,50 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
 	}
 }
 
-float MapInfo_Type_FromString(string t)
+Gametype MapInfo_Type(int 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 == "invasion")
-	{
-		print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
-		t = "inv";
-		print("'. Should use '", t, "'.\n");
-	}
-	if(t == "assault")
-	{
-		print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
-		t = "as";
-		print("'. Should use '", t, "'.\n");
-	}
-	if(t == "race")
-	{
-		print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
-		t = "rc";
-		print("'. Should use '", t, "'.\n");
-	}
-	if(t == "all")
-		return MAPINFO_TYPE_ALL;
-	for(e = MapInfo_Type_first; e; e = e.enemy)
-		if(t == e.mdl)
-			return e.items;
+	FOREACH(Gametypes, it.items == t, return it);
+	return NULL;
+}
+
+int MapInfo_Type_FromString(string t)
+{
+#define deprecate(from, to) MACRO_BEGIN { \
+	if (t == #from) { \
+		string replacement = #to; \
+		LOG_MAPWARNF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.\n", MapInfo_Map_bspname, t, replacement); \
+		t = replacement; \
+	} \
+} MACRO_END
+	deprecate(nexball, nb);
+	deprecate(freezetag, ft);
+	deprecate(keepaway, ka);
+	deprecate(invasion, inv);
+	deprecate(assault, as);
+	deprecate(race, rc);
+	if (t == "all") return MAPINFO_TYPE_ALL;
+	FOREACH(Gametypes, it.mdl == t, return it.items);
 	return 0;
+#undef deprecate
 }
 
 string MapInfo_Type_Description(float t)
 {
-	entity e;
-	for(e = MapInfo_Type_first; e; e = e.enemy)
-		if(t == e.items)
-			return e.gametype_description;
+	FOREACH(Gametypes, it.items == t, return it.gametype_description);
 	return "";
 }
 
 string MapInfo_Type_ToString(float t)
 {
-	entity e;
 	if(t == MAPINFO_TYPE_ALL)
 	 	return "all";
-	for(e = MapInfo_Type_first; e; e = e.enemy)
-		if(t == e.items)
-			return e.mdl;
+	FOREACH(Gametypes, it.items == t, return it.mdl);
 	return "";
 }
 
 string MapInfo_Type_ToText(float t)
 {
-	entity e;
-	for(e = MapInfo_Type_first; e; e = e.enemy)
-		if(t == e.items)
-			return e.message;
+	FOREACH(Gametypes, it.items == t, return it.message);
 	/* xgettext:no-c-format */
 	return _("@!#%'n Tuba Throwing");
 }
@@ -786,10 +770,10 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s,
 		{
 			fh = fopen(s, FILE_READ);
 			if(fh < 0)
-				print("Map ", pFilename, " references not existing config file ", s, "\n");
+				LOG_MAPWARN("Map ", pFilename, " references not existing config file ", s, "\n");
 			else
 			{
-				for(;;)
+				for (;;)
 				{
 					if (!((s = fgets(fh))))
 						break;
@@ -815,23 +799,23 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s,
 			}
 		}
 		else
-			print("Map ", pFilename, " uses too many levels of inclusion\n");
+			LOG_MAPWARN("Map ", pFilename, " uses too many levels of inclusion\n");
 	}
 	else if(t == "")
-		print("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+		LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
 	else if (!cvar_value_issafe(t))
-		print("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+		LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
 	else if (!cvar_value_issafe(s))
-		print("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+		LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
 	else if(matchacl(MAPINFO_SETTEMP_ACL_SYSTEM, t) <= 0)
-		print("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+		LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
 	else if(matchacl(acl, t) <= 0)
-		print("Map ", pFilename, " contains a denied setting, ignored\n");
+		LOG_MAPWARN("Map ", pFilename, " contains a denied setting, ignored\n");
 	else
 	{
 		if(type == 0) // server set
 		{
-			dprint("Applying temporary setting ", t, " := ", s, "\n");
+			LOG_TRACE("Applying temporary setting ", t, " := ", s, "\n");
 			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
@@ -839,7 +823,7 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s,
 		}
 		else
 		{
-			dprint("Applying temporary client setting ", t, " := ", s, "\n");
+			LOG_TRACE("Applying temporary client setting ", t, " := ", s, "\n");
 			MapInfo_Map_clientstuff = strcat(
 					MapInfo_Map_clientstuff, "cl_cmd settemp \"", t, "\" \"", s, "\"\n"
 					);
@@ -860,32 +844,33 @@ float MapInfo_isRedundant(string fn, string t)
 	t = strreplace("'", "-", t);
 
 	if(!strcasecmp(fn, t))
-		return TRUE;
+		return true;
 
 	// we allow the visible title to have punctuation the file name does
 	// not, but not vice versa
 	t = strreplace("-", "", t);
 
 	if(!strcasecmp(fn, t))
-		return TRUE;
+		return true;
 
-	return FALSE;
+	return false;
 }
 
 // load info about a map by name into the MapInfo_Map_* globals
-float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, float pGametypeToSet)
+float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int pGametypeToSet)
 {
 	string fn;
 	string s, t;
 	float fh;
-	float r, f, n, i, p;
+	int f, i;
+	float r, n, p;
 	string acl;
 
 	acl = MAPINFO_SETTEMP_ACL_USER;
 
 	if(strstrofs(pFilename, "/", 0) >= 0)
 	{
-		print("Invalid character in map name, ignored\n");
+		LOG_MAPWARN("Invalid character in map name, ignored\n");
 		return 0;
 	}
 
@@ -931,7 +916,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo
 			{
 				n = tokenize_console(cvar_string("g_cdtracks_remaplist"));
 				s = strcat(" ", cvar_string("g_cdtracks_dontusebydefault"), " ");
-				for(;;)
+				for (;;)
 				{
 					i = floor(random() * n);
 					if(strstrofs(s, strcat(" ", argv(i), " "), 0) < 0)
@@ -975,11 +960,11 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo
 				error("... but I just wrote it!");
 		}
 
-		print("WARNING: autogenerated mapinfo file ", fn, " has been loaded; please edit that file and move it to maps/", pFilename, ".mapinfo\n");
+		LOG_MAPWARN("autogenerated mapinfo file ", fn, " has been loaded; please edit that file and move it to maps/", pFilename, ".mapinfo\n");
 	}
 
 	_MapInfo_Map_Reset();
-	for(;;)
+	for (;;)
 	{
 		if (!((s = fgets(fh))))
 			break;
@@ -1014,7 +999,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo
 			else if(t == "monsters") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_MONSTERS;
 			else if(t == "new_toys") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_WEAPONS;
 			else
-				dprint("Map ", pFilename, " supports unknown feature ", t, ", ignored\n");
+				LOG_MAPWARN("Map ", pFilename, " supports unknown feature ", t, ", ignored\n");
 		}
 		else if(t == "hidden")
 		{
@@ -1032,15 +1017,20 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo
 		{
 			MapInfo_Map_flags |= MAPINFO_FLAG_NOAUTOMAPLIST;
 		}
+		else if(t == "gameversion_min")
+		{
+			if (cvar("gameversion") < stof(s))
+				MapInfo_Map_flags |= MAPINFO_FLAG_NOAUTOMAPLIST;
+		}
 		else if(t == "type")
 		{
 			t = car(s); s = cdr(s);
 			f = MapInfo_Type_FromString(t);
-			dprint("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");
+			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);
+				_MapInfo_Map_ApplyGametype (s, pGametypeToSet, f, true);
 			else
-				dprint("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
+				LOG_MAPWARN("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
 		}
 		else if(t == "gametype")
 		{
@@ -1049,7 +1039,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo
 			if(f)
 				_MapInfo_Map_ApplyGametypeEx (s, pGametypeToSet, f);
 			else
-				dprint("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
+				LOG_MAPWARN("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
 		}
 		else if(t == "size")
 		{
@@ -1060,24 +1050,24 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo
 			t = car(s); s = cdr(s); d = stof(t);
 			t = car(s); s = cdr(s); e = stof(t);
 			if(s == "")
-				print("Map ", pFilename, " contains an incorrect size line (not enough params), syntax: size mins_x mins_y mins_z maxs_x maxs_y maxs_z\n");
+				LOG_MAPWARN("Map ", pFilename, " contains an incorrect size line (not enough params), syntax: size mins_x mins_y mins_z maxs_x maxs_y maxs_z\n");
 			else
 			{
 				t = car(s); s = cdr(s); f = stof(t);
 				if(s != "")
-					print("Map ", pFilename, " contains an incorrect size line (too many params), syntax: size mins_x mins_y mins_z maxs_x maxs_y maxs_z\n");
+					LOG_MAPWARN("Map ", pFilename, " contains an incorrect size line (too many params), syntax: size mins_x mins_y mins_z maxs_x maxs_y maxs_z\n");
 				else
 				{
 					if(a >= d || b >= e || c >= f)
-						print("Map ", pFilename, " contains an incorrect size line, mins have to be < maxs\n");
+						LOG_MAPWARN("Map ", pFilename, " contains an incorrect size line, mins have to be < maxs\n");
 					else
 					{
-						MapInfo_Map_mins_x = a;
-						MapInfo_Map_mins_y = b;
-						MapInfo_Map_mins_z = c;
-						MapInfo_Map_maxs_x = d;
-						MapInfo_Map_maxs_y = e;
-						MapInfo_Map_maxs_z = f;
+						MapInfo_Map_mins.x = a;
+						MapInfo_Map_mins.y = b;
+						MapInfo_Map_mins.z = c;
+						MapInfo_Map_maxs.x = d;
+						MapInfo_Map_maxs.y = e;
+						MapInfo_Map_maxs.z = f;
 					}
 				}
 			}
@@ -1094,7 +1084,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo
 			}
 			else
 			{
-				dprint("Map ", pFilename, " has a setting for unknown game type ", t, ", ignored\n");
+				LOG_MAPWARN("Map ", pFilename, " has a setting for unknown game type ", t, ", ignored\n");
 			}
 		}
 		else if(t == "clientsettemp_for_type")
@@ -1109,23 +1099,29 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo
 			}
 			else
 			{
-				dprint("Map ", pFilename, " has a client setting for unknown game type ", t, ", ignored\n");
+				LOG_MAPWARN("Map ", pFilename, " has a client setting for unknown game type ", t, ", ignored\n");
 			}
 		}
 		else if(t == "fog")
 		{
 			if (!cvar_value_issafe(s))
-				print("Map ", pFilename, " contains a potentially harmful fog setting, ignored\n");
+				LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful fog setting, ignored\n");
 			else
 				MapInfo_Map_fog = s;
 		}
 		else if(t == "cdtrack")
 		{
 			t = car(s); s = cdr(s);
-			if(pGametypeToSet) // FIXME is this check right here?
+			// We do this only if pGametypeToSet even though this
+			// content is theoretically game type independent,
+			// because MapInfo_Map_clientstuff contains otherwise
+			// game type dependent stuff. That way this value stays
+			// empty when not setting a game type to not set any
+			// false expectations.
+			if(pGametypeToSet)
 			{
 				if (!cvar_value_issafe(t))
-					print("Map ", pFilename, " contains a potentially harmful cdtrack, ignored\n");
+					LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful cdtrack, ignored\n");
 				else
 					MapInfo_Map_clientstuff = strcat(
 						MapInfo_Map_clientstuff, "cd loop \"", t, "\"\n"
@@ -1133,7 +1129,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo
 			}
 		}
 		else
-			dprint("Map ", pFilename, " provides unknown info item ", t, ", ignored\n");
+			LOG_MAPWARN("Map ", pFilename, " provides unknown info item ", t, ", ignored\n");
 	}
 	fclose(fh);
 
@@ -1147,10 +1143,10 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo
 	MapInfo_Cache_Store();
 	if(MapInfo_Map_supportedGametypes != 0)
 		return r;
-	dprint("Map ", pFilename, " supports no game types, ignored\n");
+	LOG_MAPWARN("Map ", pFilename, " supports no game types, ignored\n");
 	return 0;
 }
-float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametypeToSet)
+float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, int pGametypeToSet)
 {
 	float r = MapInfo_Get_ByName_NoFallbacks(pFilename, pAllowGenerate, pGametypeToSet);
 
@@ -1229,26 +1225,19 @@ string MapInfo_FixName(string s)
 	return MapInfo_FindName_match;
 }
 
-float MapInfo_CurrentFeatures()
+int MapInfo_CurrentFeatures()
 {
-	float req;
-	req = 0;
-	if(!(cvar("g_lms") || cvar("g_instagib") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") || cvar("g_race") || cvar("g_cts") || cvar("g_nexball")))
+	int req = 0;
+	if(!(cvar("g_lms") || cvar("g_instagib") || cvar("g_overkill") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") || cvar("g_race") || cvar("g_cts") || cvar("g_nexball")))
 		req |= MAPINFO_FEATURE_WEAPONS;
 	return req;
 }
 
-float MapInfo_CurrentGametype()
+int MapInfo_CurrentGametype()
 {
-	float prev;
-	entity e;
-	prev = cvar("gamecfg");
-	for(e = MapInfo_Type_first; e; e = e.enemy)
-		if(cvar(e.netname))
-			if(prev != e.items)
-				return e.items;
-	if(prev)
-		return prev;
+	int prev = cvar("gamecfg");
+	FOREACH(Gametypes, cvar(it.netname) && it.items != prev, return it.items);
+	if (prev) return prev;
 	return MAPINFO_TYPE_DEATHMATCH;
 }
 
@@ -1271,11 +1260,9 @@ float MapInfo_CheckMap(string s) // returns 0 if the map can't be played with th
 	return r;
 }
 
-void MapInfo_SwitchGameType(float t)
+void MapInfo_SwitchGameType(int t)
 {
-	entity e;
-	for(e = MapInfo_Type_first; e; e = e.enemy)
-		cvar_set(e.netname, (t == e.items) ? "1" : "0");
+	FOREACH(Gametypes, true, cvar_set(it.netname, (it.items == t) ? "1" : "0"));
 }
 
 void MapInfo_LoadMap(string s, float reinit)
@@ -1346,14 +1333,14 @@ void MapInfo_LoadMapSettings(string s) // to be called from worldspawn
 	{
 		if(cvar("g_mapinfo_allow_unsupported_modes_and_let_stuff_break"))
 		{
-			print("EMERGENCY: 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.\n");
 			_MapInfo_Map_ApplyGametypeEx("", t, t);
 			return; // do not call Get_ByName!
 		}
 
 		if(MapInfo_Map_supportedGametypes == 0)
 		{
-			print("Mapinfo system is not functional at all. Assuming deathmatch.\n");
+			LOG_SEVERE("Mapinfo system is not functional at all. Assuming deathmatch.\n");
 			MapInfo_Map_supportedGametypes = MAPINFO_TYPE_DEATHMATCH;
 			MapInfo_LoadMapSettings_SaveGameType(MAPINFO_TYPE_DEATHMATCH);
 			_MapInfo_Map_ApplyGametypeEx("", MAPINFO_TYPE_DEATHMATCH, MAPINFO_TYPE_DEATHMATCH);
@@ -1368,7 +1355,7 @@ void MapInfo_LoadMapSettings(string s) // to be called from worldspawn
 		}
 
 		// t is now a supported mode!
-		print("EMERGENCY: can't play the selected map in the given game mode. Falling back to a supported mode.\n");
+		LOG_WARNING("can't play the selected map in the given game mode. Falling back to a supported mode.\n");
 		MapInfo_LoadMapSettings_SaveGameType(t);
 	}
 	MapInfo_Get_ByName(s, 1, t);
@@ -1395,14 +1382,13 @@ void MapInfo_Shutdown()
 	{
 		search_end(_MapInfo_globhandle);
 		_MapInfo_globhandle = -1;
-		_MapInfo_globopen = FALSE;
+		_MapInfo_globopen = false;
 	}
 }
 
-float MapInfo_ForbiddenFlags()
+int MapInfo_ForbiddenFlags()
 {
-	float f;
-	f = MAPINFO_FLAG_FORBIDDEN;
+	int f = MAPINFO_FLAG_FORBIDDEN;
 
 #ifndef MENUQC
 	if (!cvar("g_maplist_allow_hidden"))
@@ -1415,10 +1401,9 @@ float MapInfo_ForbiddenFlags()
 	return f;
 }
 
-float MapInfo_RequiredFlags()
+int MapInfo_RequiredFlags()
 {
-	float f;
-	f = 0;
+	int f = 0;
 
 	if(cvar("g_maplist_allow_frustrating") > 1)
 		f |= MAPINFO_FLAG_FRUSTRATING;