X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=447e7730e205c9d2ecbff65f102886c41bca8118;hp=eff61dbdf713621fdb950acb44f4035408068c99;hb=42e255d014f2c6a1871177ea511f630624cdfb57;hpb=86c9dc7c3696c329496b06375c1e79fb407401ce diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index eff61dbdf..447e7730e 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -1,17 +1,12 @@ #if defined(CSQC) - #include "../dpdefs/csprogsdefs.qh" #include "../client/defs.qh" #include "util.qh" - #include "buffs.qh" - #include "weapons/all.qh" + #include #include "mapinfo.qh" #elif defined(MENUQC) #elif defined(SVQC) - #include "../dpdefs/progsdefs.qh" - #include "../dpdefs/dpextensions.qh" #include "util.qh" - #include "buffs.qh" - #include "monsters/all.qh" + #include #include "mapinfo.qh" #endif @@ -395,7 +390,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); @@ -602,25 +597,20 @@ void _MapInfo_Map_ApplyGametype(string s, int pWantedType, int pThisType, int lo string _MapInfo_GetDefaultEx(float t) { - FOREACH(MAPINFO_TYPES, it.items == t, LAMBDA(return it.model2)); + FOREACH(Gametypes, it.items == t, return it.model2); return ""; } float _MapInfo_GetTeamPlayBool(float t) { - FOREACH(MAPINFO_TYPES, it.items == t, LAMBDA(return it.team)); + FOREACH(Gametypes, it.items == t, return it.team); return false; } void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType) { - string sa, k, v; - float p; - string fraglimit_normal; - string fraglimit_teams; - MapInfo_Map_supportedGametypes |= pThisType; - if(!(pThisType & pWantedType)) + if (!(pThisType & pWantedType)) return; // reset all the cvars to their defaults @@ -628,74 +618,60 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType) cvar_set("timelimit", cvar_defstring("timelimit")); cvar_set("leadlimit", cvar_defstring("leadlimit")); cvar_set("fraglimit", cvar_defstring("fraglimit")); - cvar_set("g_tdm_teams", cvar_defstring("g_tdm_teams")); - cvar_set("g_ca_teams", cvar_defstring("g_ca_teams")); - cvar_set("g_freezetag_teams", cvar_defstring("g_freezetag_teams")); - cvar_set("g_keyhunt_teams", cvar_defstring("g_keyhunt_teams")); - cvar_set("g_domination_default_teams", cvar_defstring("g_domination_default_teams")); - cvar_set("g_race_qualifying_timelimit", cvar_defstring("g_race_qualifying_timelimit")); - - fraglimit_normal = string_null; - fraglimit_teams = string_null; - - s = strcat(_MapInfo_GetDefaultEx(pWantedType), " ", s); - while(s != "") - { - sa = car(s); - s = cdr(s); + FOREACH(Gametypes, true, it.m_parse_mapinfo(string_null, string_null)); - if(sa == "") - continue; + string fraglimit_normal = string_null; + string fraglimit_teams = string_null; - p = strstrofs(sa, "=", 0); - if(p < 0) - { - LOG_INFO("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n"); + for (s = strcat(_MapInfo_GetDefaultEx(pWantedType), " ", s); s != ""; s = cdr(s)) { + string sa = car(s); + 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); continue; } - k = substring(sa, 0, p); - v = substring(sa, p+1, -1); - - if(k == "timelimit") - { - cvar_set("timelimit", v); - } - else if(k == "leadlimit") - { - cvar_set("leadlimit", v); - } - else if(k == "pointlimit" || k == "fraglimit" || k == "lives" || k == "laplimit" || k == "caplimit") - { - fraglimit_normal = v; - } - else if(k == "teampointlimit" || k == "teamlaplimit") - { - fraglimit_teams = v; - } - else if(k == "teams") - { - cvar_set("g_tdm_teams", v); - cvar_set("g_ca_teams", v); - cvar_set("g_freezetag_teams", v); - cvar_set("g_keyhunt_teams", v); - cvar_set("g_domination_default_teams", v); - cvar_set("g_invasion_teams", v); - } - else if(k == "qualifying_timelimit") - { - cvar_set("g_race_qualifying_timelimit", v); - } - else if(k == "skill") - { - // ignore - } - else - { - LOG_INFO("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n"); + string k = substring(sa, 0, p); + string v = substring(sa, p + 1, -1); + bool handled = true; + switch (k) { + case "timelimit": + { + cvar_set("timelimit", v); + break; + } + case "leadlimit": + { + cvar_set("leadlimit", v); + break; + } + case "pointlimit": + case "fraglimit": + case "lives": + case "laplimit": + case "caplimit": + { + fraglimit_normal = v; + break; + } + case "teampointlimit": + case "teamlaplimit": + { + fraglimit_teams = v; + break; + } + default: + { + handled = false; + break; + } } + 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); } - if(pWantedType == MAPINFO_TYPE_RACE && cvar("g_race_teams") >= 2) + if (pWantedType == MAPINFO_TYPE_RACE && cvar("g_race_teams") >= 2) { if(fraglimit_teams) cvar_set("fraglimit", fraglimit_teams); @@ -707,53 +683,36 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType) } } -float MapInfo_Type_FromString(string t) +Gametype MapInfo_Type(int t) { - if(t == "nexball") - { - LOG_INFO("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t); - t = "nb"; - LOG_INFO("'. Should use '", t, "'.\n"); - } - if(t == "freezetag") - { - LOG_INFO("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t); - t = "ft"; - LOG_INFO("'. Should use '", t, "'.\n"); - } - if(t == "keepaway") - { - LOG_INFO("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t); - t = "ka"; - LOG_INFO("'. Should use '", t, "'.\n"); - } - if(t == "invasion") - { - LOG_INFO("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t); - t = "inv"; - LOG_INFO("'. Should use '", t, "'.\n"); - } - if(t == "assault") - { - LOG_INFO("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t); - t = "as"; - LOG_INFO("'. Should use '", t, "'.\n"); - } - if(t == "race") - { - LOG_INFO("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t); - t = "rc"; - LOG_INFO("'. Should use '", t, "'.\n"); - } - if(t == "all") - return MAPINFO_TYPE_ALL; - FOREACH(MAPINFO_TYPES, it.mdl == t, LAMBDA(return it.items)); + FOREACH(Gametypes, it.items == t, return it); + return NULL; +} + +int 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); \ + t = replacement; \ + } \ +} MACRO_END + deprecate(nexball, nb); + deprecate(freezetag, ft); + deprecate(keepaway, ka); + deprecate(invasion, inv); + deprecate(assault, as); + deprecate(race, rc); + if (t == "all") return MAPINFO_TYPE_ALL; + FOREACH(Gametypes, it.mdl == t, return it.items); return 0; +#undef deprecate } string MapInfo_Type_Description(float t) { - FOREACH(MAPINFO_TYPES, it.items == t, LAMBDA(return it.gametype_description)); + FOREACH(Gametypes, it.items == t, return it.gametype_description); return ""; } @@ -761,13 +720,13 @@ string MapInfo_Type_ToString(float t) { if(t == MAPINFO_TYPE_ALL) return "all"; - FOREACH(MAPINFO_TYPES, it.items == t, LAMBDA(return it.mdl)); + FOREACH(Gametypes, it.items == t, return it.mdl); return ""; } string MapInfo_Type_ToText(float t) { - FOREACH(MAPINFO_TYPES, it.items == t, LAMBDA(return it.message)); + FOREACH(Gametypes, it.items == t, return it.message); /* xgettext:no-c-format */ return _("@!#%'n Tuba Throwing"); } @@ -811,7 +770,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 (;;) @@ -840,18 +799,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 @@ -911,7 +870,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; } @@ -1001,7 +960,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(); @@ -1040,7 +999,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") { @@ -1058,15 +1017,20 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p { MapInfo_Map_flags |= MAPINFO_FLAG_NOAUTOMAPLIST; } + else if(t == "gameversion_min") + { + if (cvar("gameversion") < stof(s)) + MapInfo_Map_flags |= MAPINFO_FLAG_NOAUTOMAPLIST; + } else if(t == "type") { t = car(s); s = cdr(s); f = MapInfo_Type_FromString(t); - LOG_TRACE("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") { @@ -1075,7 +1039,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") { @@ -1086,16 +1050,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; @@ -1120,7 +1084,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") @@ -1135,13 +1099,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; } @@ -1157,7 +1121,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" @@ -1165,7 +1129,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); @@ -1179,7 +1143,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) @@ -1272,7 +1236,7 @@ int MapInfo_CurrentFeatures() int MapInfo_CurrentGametype() { int prev = cvar("gamecfg"); - FOREACH(MAPINFO_TYPES, cvar(it.netname) && it.items != prev, LAMBDA(return it.items)); + FOREACH(Gametypes, cvar(it.netname) && it.items != prev, return it.items); if (prev) return prev; return MAPINFO_TYPE_DEATHMATCH; } @@ -1298,9 +1262,7 @@ float MapInfo_CheckMap(string s) // returns 0 if the map can't be played with th void MapInfo_SwitchGameType(int t) { - FOREACH(MAPINFO_TYPES, true, LAMBDA( - cvar_set(it.netname, (it.items == t) ? "1" : "0") - )); + FOREACH(Gametypes, true, cvar_set(it.netname, (it.items == t) ? "1" : "0")); } void MapInfo_LoadMap(string s, float reinit) @@ -1371,14 +1333,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); @@ -1393,7 +1355,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);