X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=d1b7ce16fa861bb502311c82ee049a66817869ad;hp=2bc84c4593afec5e62a5ddcbbfc689cd2c92d71f;hb=007d50358916330dd8cfceb20edc93e9a946bbc3;hpb=0db17af3f2fb3154fff6000a414a0320ea383747 diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 2bc84c4593..d1b7ce16fa 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -1,13 +1,12 @@ +#include "mapinfo.qh" #if defined(CSQC) #include "../client/defs.qh" #include "util.qh" - #include - #include "mapinfo.qh" + #include #elif defined(MENUQC) #elif defined(SVQC) #include "util.qh" - #include - #include "mapinfo.qh" + #include #endif // generic string stuff @@ -377,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); @@ -548,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); @@ -588,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) @@ -608,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 @@ -678,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 (;;) @@ -707,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 @@ -778,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; } @@ -868,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(); @@ -907,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") { @@ -934,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") { @@ -947,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") { @@ -958,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; @@ -983,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; } @@ -1031,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" @@ -1039,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); @@ -1053,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) @@ -1145,17 +1146,19 @@ int MapInfo_CurrentFeatures() Gametype MapInfo_CurrentGametype() { - Gametype prev = Gametypes_from(cvar("gamecfg")); + Gametype prev = Gametypes_from(cvar("gamecfg") - 1); FOREACH(Gametypes, cvar(it.netname) && it != prev, return it); return prev ? prev : MAPINFO_TYPE_DEATHMATCH; } -float _MapInfo_CheckMap(string s) // returns 0 if the map can't be played with the current settings, 1 otherwise +float _MapInfo_CheckMap(string s, bool gametype_only) // returns 0 if the map can't be played with the current settings, 1 otherwise { if(!MapInfo_Get_ByName(s, 1, NULL)) return 0; if((MapInfo_Map_supportedGametypes & MapInfo_CurrentGametype().m_flags) == 0) return 0; + if (gametype_only) + return 1; if((MapInfo_Map_supportedFeatures & MapInfo_CurrentFeatures()) != MapInfo_CurrentFeatures()) return 0; return 1; @@ -1164,7 +1167,7 @@ float _MapInfo_CheckMap(string s) // returns 0 if the map can't be played with t float MapInfo_CheckMap(string s) // returns 0 if the map can't be played with the current settings, 1 otherwise { float r; - r = _MapInfo_CheckMap(s); + r = _MapInfo_CheckMap(s, false); MapInfo_ClearTemps(); return r; } @@ -1227,7 +1230,7 @@ string MapInfo_ListAllAllowedMaps(float pRequiredFlags, float pForbiddenFlags) void MapInfo_LoadMapSettings_SaveGameType(Gametype t) { MapInfo_SwitchGameType(t); - cvar_set("gamecfg", ftos(t.m_id)); + cvar_set("gamecfg", ftos(t.m_id + 1)); MapInfo_LoadedGametype = t; } @@ -1236,7 +1239,7 @@ void MapInfo_LoadMapSettings(string s) // to be called from worldspawn Gametype t = MapInfo_CurrentGametype(); MapInfo_LoadMapSettings_SaveGameType(t); - if(!_MapInfo_CheckMap(s)) // with underscore, it keeps temps + if(!_MapInfo_CheckMap(s, true)) // with underscore, it keeps temps { if(cvar("g_mapinfo_allow_unsupported_modes_and_let_stuff_break")) { @@ -1260,12 +1263,16 @@ 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); } + if(!_MapInfo_CheckMap(s, false)) { // with underscore, it keeps temps + LOG_WARNF("the selected map lacks features required by current settings; playing anyway."); + } MapInfo_Get_ByName(s, 1, t); } @@ -1298,7 +1305,7 @@ int MapInfo_ForbiddenFlags() { int f = MAPINFO_FLAG_FORBIDDEN; -#ifndef MENUQC +#ifdef GAMEQC if (!cvar("g_maplist_allow_hidden")) #endif f |= MAPINFO_FLAG_HIDDEN;