X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=0884bc8d79054c29d6d88bacb75ad88de011e09b;hb=f41f81f37e3ecf5a2d14f7bc7ffd7bbf09fff32e;hp=2af3d90823e9dcddee7f187889ca50e2da4eddf2;hpb=cc37ae9ec08cca9f8b17cdbf91e71380d0d6f700;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 2af3d9082..0884bc8d7 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -9,6 +9,8 @@ #include #endif +bool autocvar_g_mapinfo_ignore_warnings; + // generic string stuff int _MapInfo_Cache_Active; @@ -229,16 +231,13 @@ string MapInfo_BSPName_ByID(float i) string unquote(string s) { - float i, j, l; - l = strlen(s); - j = -1; - for(i = 0; i < l; ++i) + float l = strlen(s); + for(float i = 0; i < l; ++i) { - string ch; - ch = substring(s, i, 1); - if(ch != " ") if(ch != "\"") + string ch = substring(s, i, 1); + if((ch != " ") && (ch != "\"")) { - for(j = strlen(s) - i - 1; j > 0; --j) + for(float j = l - i - 1; j > 0; --j) { ch = substring(s, i+j, 1); if(ch != " ") if(ch != "\"") @@ -284,7 +283,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp } if(fh < 0) return 0; - LOG_INFO("Analyzing ", fn, " to generate initial mapinfo\n"); + LOG_INFO("Analyzing ", fn, " to generate initial mapinfo"); inWorldspawn = 2; MapInfo_Map_flags = 0; @@ -547,7 +546,8 @@ void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThis if (sa == "") continue; int p = strstrofs(sa, "=", 0); if (p < 0) { - LOG_WARNF("Invalid gametype setting in mapinfo for gametype %s: %s", MapInfo_Type_ToString(pWantedType), sa); + if(!autocvar_g_mapinfo_ignore_warnings) + LOG_WARNF("Invalid gametype setting in mapinfo for gametype %s: %s", MapInfo_Type_ToString(pWantedType), sa); continue; } string k = substring(sa, 0, p); @@ -586,7 +586,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThis } } FOREACH(Gametypes, true, handled |= it.m_parse_mapinfo(k, v)); - if (!handled) + if (!handled && !autocvar_g_mapinfo_ignore_warnings) LOG_WARNF("Invalid gametype setting in mapinfo for gametype %s: %s", MapInfo_Type_ToString(pWantedType), sa); } @@ -607,7 +607,8 @@ Gametype MapInfo_Type_FromString(string t) #define deprecate(from, to) MACRO_BEGIN { \ if (t == #from) { \ string replacement = #to; \ - LOG_WARNF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.", MapInfo_Map_bspname, t, replacement); \ + if(!autocvar_g_mapinfo_ignore_warnings) \ + LOG_WARNF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.", MapInfo_Map_bspname, t, replacement); \ t = replacement; \ } \ } MACRO_END @@ -867,7 +868,8 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet error("... but I just wrote it!"); } - LOG_WARN("autogenerated mapinfo file ", fn, " has been loaded; please edit that file and move it to maps/", pFilename, ".mapinfo"); + if(!autocvar_g_mapinfo_ignore_warnings) + LOG_WARN("autogenerated mapinfo file ", fn, " has been loaded; please edit that file and move it to maps/", pFilename, ".mapinfo"); } _MapInfo_Map_Reset(); @@ -933,11 +935,12 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet { t = car(s); s = cdr(s); Gametype f = MapInfo_Type_FromString(t); - 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(!autocvar_g_mapinfo_ignore_warnings) + //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_WARN("Map ", pFilename, " supports unknown game type ", t, ", ignored"); + else if(!autocvar_g_mapinfo_ignore_warnings) + LOG_DEBUG("Map ", pFilename, " supports unknown game type ", t, ", ignored"); } else if(t == "gametype") { @@ -945,8 +948,8 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet Gametype f = MapInfo_Type_FromString(t); if(f) _MapInfo_Map_ApplyGametypeEx (s, pGametypeToSet, f); - else - LOG_WARN("Map ", pFilename, " supports unknown game type ", t, ", ignored"); + else if(!autocvar_g_mapinfo_ignore_warnings) + LOG_DEBUG("Map ", pFilename, " supports unknown game type ", t, ", ignored"); } else if(t == "size") { @@ -993,7 +996,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet } else { - LOG_WARN("Map ", pFilename, " has a setting for unknown game type ", t, ", ignored"); + LOG_DEBUG("Map ", pFilename, " has a setting for unknown game type ", t, ", ignored"); } } else if(t == "clientsettemp_for_type") @@ -1010,7 +1013,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet } else { - LOG_WARN("Map ", pFilename, " has a client setting for unknown game type ", t, ", ignored"); + LOG_DEBUG("Map ", pFilename, " has a client setting for unknown game type ", t, ", ignored"); } } else if(t == "fog") @@ -1039,7 +1042,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet ); } } - else + else if(!autocvar_g_mapinfo_ignore_warnings) LOG_WARN("Map ", pFilename, " provides unknown info item ", t, ", ignored"); } fclose(fh); @@ -1187,6 +1190,8 @@ void MapInfo_LoadMap(string s, float reinit) // MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH.m_flags); //} + LOG_INFO("Switching to map ", s); + cvar_settemp_restore(); if(reinit) localcmd(strcat("\nmap ", s, "\n")); @@ -1197,14 +1202,13 @@ void MapInfo_LoadMap(string s, float reinit) string MapInfo_ListAllowedMaps(Gametype type, float pRequiredFlags, float pForbiddenFlags) { string out; - float i; // to make absolutely sure: MapInfo_Enumerate(); MapInfo_FilterGametype(type, MapInfo_CurrentFeatures(), pRequiredFlags, pForbiddenFlags, 0); out = ""; - for(i = 0; i < MapInfo_count; ++i) + for(float i = 0; i < MapInfo_count; ++i) out = strcat(out, " ", _MapInfo_GlobItem(MapInfo_FilterList_Lookup(i))); return substring(out, 1, strlen(out) - 1); } @@ -1212,14 +1216,13 @@ string MapInfo_ListAllowedMaps(Gametype type, float pRequiredFlags, float pForbi string MapInfo_ListAllAllowedMaps(float pRequiredFlags, float pForbiddenFlags) { string out; - float i; // to make absolutely sure: MapInfo_Enumerate(); _MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, pRequiredFlags, pForbiddenFlags, 0); out = ""; - for(i = 0; i < MapInfo_count; ++i) + for(float i = 0; i < MapInfo_count; ++i) out = strcat(out, " ", _MapInfo_GlobItem(MapInfo_FilterList_Lookup(i))); MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), pRequiredFlags, pForbiddenFlags, 0);