X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=60b13b9708c6308159651f4250c9d19da57e57cc;hb=6317faf49d3c92fffe52f790ff39b6792fbfe458;hp=62600a9c4b07fec9deb809985b6c88df86aab09b;hpb=65b54b5967f0a152ff308a37196a583e816c1f72;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 62600a9c4..60b13b970 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -604,14 +604,14 @@ void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThis Gametype MapInfo_Type_FromString(string t) { -#define deprecate(from, to) MACRO_BEGIN { \ +#define deprecate(from, to) MACRO_BEGIN \ if (t == #from) { \ string replacement = #to; \ 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 +MACRO_END deprecate(nexball, nb); deprecate(freezetag, ft); deprecate(keepaway, ka); @@ -935,8 +935,8 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet { t = car(s); s = cdr(s); Gametype f = MapInfo_Type_FromString(t); - 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(!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 if(!autocvar_g_mapinfo_ignore_warnings)