]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/common/mapinfo.qc
Merge branch 'master' into Mario/vaporizer_damage
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapinfo.qc
index ccf02e71d821387f886f6c49da96c3a77564e13a..eff61dbdf713621fdb950acb44f4035408068c99 100644 (file)
@@ -1,8 +1,25 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qh"
+    #include "../client/defs.qh"
+    #include "util.qh"
+    #include "buffs.qh"
+    #include "weapons/all.qh"
+    #include "mapinfo.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qh"
+    #include "../dpdefs/dpextensions.qh"
+    #include "util.qh"
+    #include "buffs.qh"
+    #include "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 +120,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 +155,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 +169,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 +187,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 +287,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 +298,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 +336,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 +395,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_INFO(fn, " ended still in worldspawn, BUG\n");
                return 0;
        }
        diameter = vlen(mapMaxs - mapMins);
@@ -385,9 +428,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 +477,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 +485,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,23 +602,17 @@ 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(MAPINFO_TYPES, it.items == t, LAMBDA(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(MAPINFO_TYPES, it.items == t, LAMBDA(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;
@@ -613,7 +650,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
                p = strstrofs(sa, "=", 0);
                if(p < 0)
                {
-                       print("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
+                       LOG_INFO("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
                        continue;
                }
                k = substring(sa, 0, p);
@@ -654,7 +691,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
                }
                else
                {
-                       print("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
+                       LOG_INFO("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
                }
        }
 
@@ -672,77 +709,65 @@ 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);
+               LOG_INFO("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
                t = "nb";
-               print("'. Should use '", t, "'.\n");
+               LOG_INFO("'. Should use '", t, "'.\n");
        }
        if(t == "freezetag")
        {
-               print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+               LOG_INFO("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
                t = "ft";
-               print("'. Should use '", t, "'.\n");
+               LOG_INFO("'. Should use '", t, "'.\n");
        }
        if(t == "keepaway")
        {
-               print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+               LOG_INFO("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
                t = "ka";
-               print("'. Should use '", t, "'.\n");
+               LOG_INFO("'. Should use '", t, "'.\n");
        }
        if(t == "invasion")
        {
-               print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+               LOG_INFO("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
                t = "inv";
-               print("'. Should use '", t, "'.\n");
+               LOG_INFO("'. Should use '", t, "'.\n");
        }
        if(t == "assault")
        {
-               print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+               LOG_INFO("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
                t = "as";
-               print("'. Should use '", t, "'.\n");
+               LOG_INFO("'. Should use '", t, "'.\n");
        }
        if(t == "race")
        {
-               print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+               LOG_INFO("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
                t = "rc";
-               print("'. Should use '", t, "'.\n");
+               LOG_INFO("'. 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(MAPINFO_TYPES, it.mdl == t, LAMBDA(return it.items));
        return 0;
 }
 
 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(MAPINFO_TYPES, it.items == t, LAMBDA(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(MAPINFO_TYPES, it.items == t, LAMBDA(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(MAPINFO_TYPES, it.items == t, LAMBDA(return it.message));
        /* xgettext:no-c-format */
        return _("@!#%'n Tuba Throwing");
 }
@@ -786,10 +811,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_INFO("Map ", pFilename, " references not existing config file ", s, "\n");
                        else
                        {
-                               for(;;)
+                               for (;;)
                                {
                                        if (!((s = fgets(fh))))
                                                break;
@@ -815,23 +840,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_INFO("Map ", pFilename, " uses too many levels of inclusion\n");
        }
        else if(t == "")
-               print("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+               LOG_INFO("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_INFO("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_INFO("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_INFO("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_INFO("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 +864,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 +885,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_INFO("Invalid character in map name, ignored\n");
                return 0;
        }
 
@@ -931,7 +957,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 +1001,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_INFO("WARNING: 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 +1040,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_TRACE("Map ", pFilename, " supports unknown feature ", t, ", ignored\n");
                }
                else if(t == "hidden")
                {
@@ -1036,11 +1062,11 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo
                {
                        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_TRACE("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_TRACE("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
                }
                else if(t == "gametype")
                {
@@ -1049,7 +1075,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_TRACE("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
                }
                else if(t == "size")
                {
@@ -1060,24 +1086,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_INFO("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_INFO("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_INFO("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 +1120,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_TRACE("Map ", pFilename, " has a setting for unknown game type ", t, ", ignored\n");
                        }
                }
                else if(t == "clientsettemp_for_type")
@@ -1109,23 +1135,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_TRACE("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_INFO("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_INFO("Map ", pFilename, " contains a potentially harmful cdtrack, ignored\n");
                                else
                                        MapInfo_Map_clientstuff = strcat(
                                                MapInfo_Map_clientstuff, "cd loop \"", t, "\"\n"
@@ -1133,7 +1165,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo
                        }
                }
                else
-                       dprint("Map ", pFilename, " provides unknown info item ", t, ", ignored\n");
+                       LOG_TRACE("Map ", pFilename, " provides unknown info item ", t, ", ignored\n");
        }
        fclose(fh);
 
@@ -1147,10 +1179,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_TRACE("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 +1261,19 @@ string MapInfo_FixName(string s)
        return MapInfo_FindName_match;
 }
 
-float MapInfo_CurrentFeatures()
+int MapInfo_CurrentFeatures()
 {
-       float req;
-       req = 0;
+       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(MAPINFO_TYPES, cvar(it.netname) && it.items != prev, LAMBDA(return it.items));
+       if (prev) return prev;
        return MAPINFO_TYPE_DEATHMATCH;
 }
 
@@ -1271,11 +1296,11 @@ 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(MAPINFO_TYPES, true, LAMBDA(
+               cvar_set(it.netname, (it.items == t) ? "1" : "0")
+       ));
 }
 
 void MapInfo_LoadMap(string s, float reinit)
@@ -1346,14 +1371,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_INFO("EMERGENCY: 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_INFO("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 +1393,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_INFO("EMERGENCY: 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 +1420,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 +1439,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;