From fcb583ff24ba71d33cbc423123ce6fa780170fc1 Mon Sep 17 00:00:00 2001 From: TimePath Date: Fri, 11 Dec 2015 09:35:06 +1100 Subject: [PATCH] Console: reduce map verbosity --- qcsrc/common/mapinfo.qc | 63 ++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 173aa8e42..b4cd54184 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -10,6 +10,11 @@ #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; @@ -390,7 +395,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp } if(inWorldspawn) { - LOG_INFO(fn, " ended still in worldspawn, BUG\n"); + LOG_MAPWARN(fn, " ended still in worldspawn, BUG\n"); return 0; } diameter = vlen(mapMaxs - mapMins); @@ -628,7 +633,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType) if (sa == "") continue; int p = strstrofs(sa, "=", 0); if (p < 0) { - LOG_WARNINGF("Invalid gametype setting in mapinfo for gametype %s: %s\n", MapInfo_Type_ToString(pWantedType), sa); + LOG_MAPWARNF("Invalid gametype setting in mapinfo for gametype %s: %s\n", MapInfo_Type_ToString(pWantedType), sa); continue; } string k = substring(sa, 0, p); @@ -668,7 +673,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType) } FOREACH(Gametypes, true, LAMBDA(handled |= it.m_parse_mapinfo(k, v))); if (!handled) - LOG_WARNINGF("Invalid gametype setting in mapinfo for gametype %s: %s\n", MapInfo_Type_ToString(pWantedType), sa); + 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) @@ -694,7 +699,7 @@ int MapInfo_Type_FromString(string t) #define deprecate(from, to) MACRO_BEGIN { \ if (t == #from) { \ string replacement = #to; \ - LOG_WARNINGF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.\n", MapInfo_Map_bspname, t, replacement); \ + LOG_MAPWARNF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.\n", MapInfo_Map_bspname, t, replacement); \ t = replacement; \ } \ } MACRO_END @@ -770,7 +775,7 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s, { fh = fopen(s, FILE_READ); if(fh < 0) - LOG_INFO("Map ", pFilename, " references not existing config file ", s, "\n"); + LOG_MAPWARN("Map ", pFilename, " references not existing config file ", s, "\n"); else { for (;;) @@ -799,18 +804,18 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s, } } else - LOG_INFO("Map ", pFilename, " uses too many levels of inclusion\n"); + LOG_MAPWARN("Map ", pFilename, " uses too many levels of inclusion\n"); } else if(t == "") - LOG_INFO("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)) - LOG_INFO("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)) - LOG_INFO("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) - LOG_INFO("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) - LOG_INFO("Map ", pFilename, " contains a denied setting, ignored\n"); + LOG_MAPWARN("Map ", pFilename, " contains a denied setting, ignored\n"); else { if(type == 0) // server set @@ -870,7 +875,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p if(strstrofs(pFilename, "/", 0) >= 0) { - LOG_INFO("Invalid character in map name, ignored\n"); + LOG_MAPWARN("Invalid character in map name, ignored\n"); return 0; } @@ -960,7 +965,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p error("... but I just wrote it!"); } - LOG_INFO("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(); @@ -999,7 +1004,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p else if(t == "monsters") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_MONSTERS; else if(t == "new_toys") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_WEAPONS; else - LOG_TRACE("Map ", pFilename, " supports unknown feature ", t, ", ignored\n"); + LOG_MAPWARN("Map ", pFilename, " supports unknown feature ", t, ", ignored\n"); } else if(t == "hidden") { @@ -1026,11 +1031,11 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p { t = car(s); s = cdr(s); f = MapInfo_Type_FromString(t); - LOG_WARNING("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); else - LOG_TRACE("Map ", pFilename, " supports unknown game type ", t, ", ignored\n"); + LOG_MAPWARN("Map ", pFilename, " supports unknown game type ", t, ", ignored\n"); } else if(t == "gametype") { @@ -1039,7 +1044,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p if(f) _MapInfo_Map_ApplyGametypeEx (s, pGametypeToSet, f); else - LOG_TRACE("Map ", pFilename, " supports unknown game type ", t, ", ignored\n"); + LOG_MAPWARN("Map ", pFilename, " supports unknown game type ", t, ", ignored\n"); } else if(t == "size") { @@ -1050,16 +1055,16 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p t = car(s); s = cdr(s); d = stof(t); t = car(s); s = cdr(s); e = stof(t); if(s == "") - 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"); + 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 != "") - 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"); + 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) - LOG_INFO("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; @@ -1084,7 +1089,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p } else { - LOG_TRACE("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") @@ -1099,13 +1104,13 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p } else { - LOG_TRACE("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)) - LOG_INFO("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; } @@ -1121,7 +1126,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p if(pGametypeToSet) { if (!cvar_value_issafe(t)) - LOG_INFO("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" @@ -1129,7 +1134,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p } } else - LOG_TRACE("Map ", pFilename, " provides unknown info item ", t, ", ignored\n"); + LOG_MAPWARN("Map ", pFilename, " provides unknown info item ", t, ", ignored\n"); } fclose(fh); @@ -1143,7 +1148,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p MapInfo_Cache_Store(); if(MapInfo_Map_supportedGametypes != 0) return r; - LOG_TRACE("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, int pGametypeToSet) @@ -1335,14 +1340,14 @@ void MapInfo_LoadMapSettings(string s) // to be called from worldspawn { if(cvar("g_mapinfo_allow_unsupported_modes_and_let_stuff_break")) { - LOG_INFO("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) { - LOG_INFO("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); @@ -1357,7 +1362,7 @@ void MapInfo_LoadMapSettings(string s) // to be called from worldspawn } // t is now a supported mode! - LOG_INFO("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); -- 2.39.2