Fix `settemp_for_type all`

Closes #1798

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 47104bb2dc42f1c7765282806859324e4c3ef2cb..7120c61eda932fa46b9cc2313dc26c8854549293 100644 (file)
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -376,7 +376,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
        }
        if(inWorldspawn)
        {
-               LOG_MAPWARN(fn, " ended still in worldspawn, BUG\n");
+               LOG_WARN(fn, " ended still in worldspawn, BUG");
                return 0;
        }
        diameter = vlen(mapMaxs - mapMins);
@@ -547,7 +547,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThis
                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);
+                       LOG_WARNF("Invalid gametype setting in mapinfo for gametype %s: %s", MapInfo_Type_ToString(pWantedType), sa);
                        continue;
                }
                string k = substring(sa, 0, p);
@@ -587,7 +587,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThis
                }
                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);
+            LOG_WARNF("Invalid gametype setting in mapinfo for gametype %s: %s", MapInfo_Type_ToString(pWantedType), sa);
        }
 
        if (pWantedType == MAPINFO_TYPE_RACE && cvar("g_race_teams") >= 2)
@@ -607,7 +607,7 @@ Gametype 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); \
+               LOG_WARNF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.", MapInfo_Map_bspname, t, replacement); \
                t = replacement; \
        } \
 } MACRO_END
@@ -677,7 +677,7 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s,
                {
                        fh = fopen(s, FILE_READ);
                        if(fh < 0)
-                               LOG_MAPWARN("Map ", pFilename, " references not existing config file ", s, "\n");
+                               LOG_WARN("Map ", pFilename, " references not existing config file ", s);
                        else
                        {
                                for (;;)
@@ -706,18 +706,18 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s,
                        }
                }
                else
-                       LOG_MAPWARN("Map ", pFilename, " uses too many levels of inclusion\n");
+                       LOG_WARN("Map ", pFilename, " uses too many levels of inclusion");
        }
        else if(t == "")
-               LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+               LOG_WARN("Map ", pFilename, " contains a potentially harmful setting, ignored");
        else if (!cvar_value_issafe(t))
-               LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+               LOG_WARN("Map ", pFilename, " contains a potentially harmful setting, ignored");
        else if (!cvar_value_issafe(s))
-               LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+               LOG_WARN("Map ", pFilename, " contains a potentially harmful setting, ignored");
        else if(matchacl(MAPINFO_SETTEMP_ACL_SYSTEM, t) <= 0)
-               LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+               LOG_WARN("Map ", pFilename, " contains a potentially harmful setting, ignored");
        else if(matchacl(acl, t) <= 0)
-               LOG_MAPWARN("Map ", pFilename, " contains a denied setting, ignored\n");
+               LOG_WARN("Map ", pFilename, " contains a denied setting, ignored");
        else
        {
                if(type == 0) // server set
@@ -777,7 +777,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 
        if(strstrofs(pFilename, "/", 0) >= 0)
        {
-               LOG_MAPWARN("Invalid character in map name, ignored\n");
+               LOG_WARN("Invalid character in map name, ignored");
                return 0;
        }
 
@@ -867,7 +867,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
                                error("... but I just wrote it!");
                }
 
-               LOG_MAPWARN("autogenerated mapinfo file ", fn, " has been loaded; please edit that file and move it to maps/", pFilename, ".mapinfo\n");
+               LOG_WARN("autogenerated mapinfo file ", fn, " has been loaded; please edit that file and move it to maps/", pFilename, ".mapinfo");
        }
 
        _MapInfo_Map_Reset();
@@ -906,7 +906,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
                        else if(t == "monsters") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_MONSTERS;
                        else if(t == "new_toys") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_WEAPONS;
                        else
-                               LOG_MAPWARN("Map ", pFilename, " supports unknown feature ", t, ", ignored\n");
+                               LOG_WARN("Map ", pFilename, " supports unknown feature ", t, ", ignored");
                }
                else if(t == "hidden")
                {
@@ -933,11 +933,11 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
                {
                        t = car(s); s = cdr(s);
                        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");
+                       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)
                                _MapInfo_Map_ApplyGametype (s, pGametypeToSet, f, true);
                        else
-                               LOG_MAPWARN("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
+                               LOG_WARN("Map ", pFilename, " supports unknown game type ", t, ", ignored");
                }
                else if(t == "gametype")
                {
@@ -946,7 +946,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
                        if(f)
                                _MapInfo_Map_ApplyGametypeEx (s, pGametypeToSet, f);
                        else
-                               LOG_MAPWARN("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
+                               LOG_WARN("Map ", pFilename, " supports unknown game type ", t, ", ignored");
                }
                else if(t == "size")
                {
@@ -957,16 +957,16 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
                        t = car(s); s = cdr(s); d = stof(t);
                        t = car(s); s = cdr(s); e = stof(t);
                        if(s == "")
-                               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");
+                               LOG_WARN("Map ", pFilename, " contains an incorrect size line (not enough params), syntax: size mins_x mins_y mins_z maxs_x maxs_y maxs_z");
                        else
                        {
                                t = car(s); s = cdr(s); f = stof(t);
                                if(s != "")
-                                       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");
+                                       LOG_WARN("Map ", pFilename, " contains an incorrect size line (too many params), syntax: size mins_x mins_y mins_z maxs_x maxs_y maxs_z");
                                else
                                {
                                        if(a >= d || b >= e || c >= f)
-                                               LOG_MAPWARN("Map ", pFilename, " contains an incorrect size line, mins have to be < maxs\n");
+                                               LOG_WARN("Map ", pFilename, " contains an incorrect size line, mins have to be < maxs");
                                        else
                                        {
                                                MapInfo_Map_mins.x = a;
@@ -982,39 +982,41 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
                else if(t == "settemp_for_type")
                {
                        t = car(s); s = cdr(s);
-                       Gametype f;
-                       if((f = MapInfo_Type_FromString(t)))
+                       bool all = t == "all";
+                       Gametype f = NULL;
+                       if(all || (f = MapInfo_Type_FromString(t)))
                        {
-                               if(f.m_flags & pGametypeToSet.m_flags)
+                               if((all ? MAPINFO_TYPE_ALL : f.m_flags) & pGametypeToSet.m_flags)
                                {
                                        _MapInfo_Parse_Settemp(pFilename, acl, 0, s, 1);
                                }
                        }
                        else
                        {
-                               LOG_MAPWARN("Map ", pFilename, " has a setting for unknown game type ", t, ", ignored\n");
+                               LOG_WARN("Map ", pFilename, " has a setting for unknown game type ", t, ", ignored");
                        }
                }
                else if(t == "clientsettemp_for_type")
                {
                        t = car(s); s = cdr(s);
-                       Gametype f;
-                       if((f = MapInfo_Type_FromString(t)))
+                       bool all = t == "all";
+                       Gametype f = NULL;
+                       if(all || (f = MapInfo_Type_FromString(t)))
                        {
-                               if(f.m_flags & pGametypeToSet.m_flags)
+                               if((all ? MAPINFO_TYPE_ALL : f.m_flags) & pGametypeToSet.m_flags)
                                {
                                        _MapInfo_Parse_Settemp(pFilename, acl, 1, s, 1);
                                }
                        }
                        else
                        {
-                               LOG_MAPWARN("Map ", pFilename, " has a client setting for unknown game type ", t, ", ignored\n");
+                               LOG_WARN("Map ", pFilename, " has a client setting for unknown game type ", t, ", ignored");
                        }
                }
                else if(t == "fog")
                {
                        if (!cvar_value_issafe(s))
-                               LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful fog setting, ignored\n");
+                               LOG_WARN("Map ", pFilename, " contains a potentially harmful fog setting, ignored");
                        else
                                MapInfo_Map_fog = s;
                }
@@ -1030,7 +1032,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
                        if(pGametypeToSet)
                        {
                                if (!cvar_value_issafe(t))
-                                       LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful cdtrack, ignored\n");
+                                       LOG_WARN("Map ", pFilename, " contains a potentially harmful cdtrack, ignored");
                                else
                                        MapInfo_Map_clientstuff = strcat(
                                                MapInfo_Map_clientstuff, "cd loop \"", t, "\"\n"
@@ -1038,7 +1040,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
                        }
                }
                else
-                       LOG_MAPWARN("Map ", pFilename, " provides unknown info item ", t, ", ignored\n");
+                       LOG_WARN("Map ", pFilename, " provides unknown info item ", t, ", ignored");
        }
        fclose(fh);
 
@@ -1052,7 +1054,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
        MapInfo_Cache_Store();
        if(MapInfo_Map_supportedGametypes != 0)
                return r;
-       LOG_MAPWARN("Map ", pFilename, " supports no game types, ignored\n");
+       LOG_WARN("Map ", pFilename, " supports no game types, ignored");
        return 0;
 }
 int MapInfo_Get_ByName(string pFilename, float pAllowGenerate, Gametype pGametypeToSet)
@@ -1259,10 +1261,11 @@ void MapInfo_LoadMapSettings(string s) // to be called from worldspawn
                        _t <<= 1;
                        MapInfo_Map_supportedGametypes = floor(MapInfo_Map_supportedGametypes >> 1);
                }
+               Gametype t_prev = t;
                FOREACH(Gametypes, it.m_flags == _t, { t = it; break; });
 
                // t is now a supported mode!
-               LOG_WARN("can't play the selected map in the given game mode. Falling back to a supported mode.");
+               LOG_WARNF("can't play the selected map in the given game mode (%s). Falling back to a supported mode (%s).", t_prev.mdl, t.mdl);
                MapInfo_LoadMapSettings_SaveGameType(t);
        }
        MapInfo_Get_ByName(s, 1, t);

diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh
index f37e2db060881e23088652e012926e668b731216..ba60b0d39c39118801d457db47fb472047c0dc3d 100644 (file)
--- a/qcsrc/common/mapinfo.qh
+++ b/qcsrc/common/mapinfo.qh
@@ -1,10 +1,5 @@
 #pragma once
 
-bool autocvar_developer_mapper;
-
-#define LOG_MAPWARN(...) MACRO_BEGIN { if (autocvar_developer_mapper) LOG_WARN(__VA_ARGS__); } MACRO_END
-#define LOG_MAPWARNF(...) MACRO_BEGIN { if (autocvar_developer_mapper) LOG_WARNF(__VA_ARGS__); } MACRO_END
-
 #include "util.qh"
 
 // info about a map that MapInfo loads

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index bb204a4b54b7742c77cf503b5f9349f4607fb76d..00bc0e5d12397c2e608cae53f245a1593d2d3e3c 100644 (file)
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -29,7 +29,7 @@ void weapon_defaultspawnfunc(entity this, Weapon e)
        {
                if (e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
                {
-                       LOG_MAPWARNF("Attempted to spawn a mutator-blocked weapon rejected: prvm_edict server %i", this);
+                       LOG_WARNF("Attempted to spawn a mutator-blocked weapon rejected: prvm_edict server %i", this);
                        startitem_failed = true;
                        return;
                }