X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=8d8884f21ddd09cb06ec94da5bb3dad95884d42e;hp=2ec902f68556d121bdceb8122adbef84f4edc999;hb=8e5d376c49510049572c7c182ba8778c8a8f80dd;hpb=fc15d72b041c9a748b605ba28735380fbe5b5b01 diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 2ec902f685..8d8884f21d 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -1,15 +1,16 @@ +#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 +bool autocvar_g_mapinfo_ignore_warnings; + // generic string stuff int _MapInfo_Cache_Active; @@ -150,7 +151,11 @@ float _MapInfo_FilterList_cmp(float i, float j, entity pass) return strcasecmp(a, b); } -float MapInfo_FilterGametype(int pGametype, int pFeatures, int pFlagsRequired, int pFlagsForbidden, bool pAbortOnGenerate) +float MapInfo_FilterGametype(Gametype pGametype, int pFeatures, int pFlagsRequired, int pFlagsForbidden, bool pAbortOnGenerate) +{ + return _MapInfo_FilterGametype(pGametype.m_flags, pFeatures, pFlagsRequired, pFlagsForbidden, pAbortOnGenerate); +} +float _MapInfo_FilterGametype(int pGametype, int pFeatures, int pFlagsRequired, int pFlagsForbidden, bool pAbortOnGenerate) { float i, j; if (!_MapInfo_filtered_allocated) @@ -161,10 +166,10 @@ float MapInfo_FilterGametype(int pGametype, int pFeatures, int pFlagsRequired, i MapInfo_count = 0; for(i = 0, j = -1; i < _MapInfo_globcount; ++i) { - if(MapInfo_Get_ByName(_MapInfo_GlobItem(i), 1, 0) == 2) // if we generated one... BAIL OUT and let the caller continue in the next frame. + if(MapInfo_Get_ByName(_MapInfo_GlobItem(i), 1, NULL) == 2) // if we generated one... BAIL OUT and let the caller continue in the next frame. if(pAbortOnGenerate) { - LOG_TRACE("Autogenerated a .mapinfo, doing the rest later.\n"); + LOG_TRACE("Autogenerated a .mapinfo, doing the rest later."); MapInfo_progress = i / _MapInfo_globcount; return 0; } @@ -226,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 != "\"") @@ -249,7 +251,7 @@ string unquote(string s) float MapInfo_Get_ByID(float i) { - if(MapInfo_Get_ByName(MapInfo_BSPName_ByID(i), 0, 0)) + if(MapInfo_Get_ByName(MapInfo_BSPName_ByID(i), 0, NULL)) return 1; return 0; } @@ -265,7 +267,6 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp float i; float inWorldspawn; float r; - float twoBaseModes; float diameter, spawnpoints; float spawnplaces; @@ -282,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; @@ -345,21 +346,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp } else if(k == "classname") { - if(v == "dom_controlpoint") - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_DOMINATION; - else if(v == "item_flag_team2") - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CTF; - else if(v == "team_CTF_blueflag") - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CTF; - else if(v == "invasion_spawnpoint") - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_INVASION; - else if(v == "target_assault_roundend") - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_ASSAULT; - else if(v == "onslaught_generator") - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_ONSLAUGHT; - else if(substring(v, 0, 8) == "nexball_" || substring(v, 0, 4) == "ball") - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_NEXBALL; - else if(v == "info_player_team1") + if(v == "info_player_team1") ++spawnpoints; else if(v == "info_player_team2") ++spawnpoints; @@ -367,10 +354,6 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp ++spawnpoints; else if(v == "info_player_deathmatch") ++spawnpoints; - else if(v == "trigger_race_checkpoint") - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_RACE; - else if(v == "target_startTimer") - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CTS; else if(v == "weapon_nex") { } else if(v == "weapon_railgun") @@ -385,47 +368,39 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_MONSTERS; else if(v == "target_music" || v == "trigger_music") _MapInfo_Map_worldspawn_music = string_null; // don't use regular BGM + else + FOREACH(Gametypes, true, it.m_generate_mapinfo(it, v)); } } } 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); - twoBaseModes = MapInfo_Map_supportedGametypes & (MAPINFO_TYPE_CTF | MAPINFO_TYPE_ASSAULT | MAPINFO_TYPE_RACE | MAPINFO_TYPE_NEXBALL); - if(twoBaseModes && (MapInfo_Map_supportedGametypes == twoBaseModes)) + int twoBaseModes = 0; + FOREACH(Gametypes, it.m_isTwoBaseMode(), twoBaseModes |= it.m_flags); + if(twoBaseModes && (twoBaseModes &= MapInfo_Map_supportedGametypes)) { - // we have a CTF-only or Assault-only map. Don't add other modes then, - // as the map is too symmetric for them. + // we have a symmetrical map, don't add the modes without bases } else { - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_DEATHMATCH; // DM always works - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_LMS; // LMS always works - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_KEEPAWAY; // Keepaway always works - - if(spawnpoints >= 8 && diameter > 4096) { - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_TEAM_DEATHMATCH; - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_FREEZETAG; - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CA; - } - if(spawnpoints >= 12 && diameter > 5120) - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_KEYHUNT; + FOREACH(Gametypes, it.m_isAlwaysSupported(it, spawnpoints, diameter), MapInfo_Map_supportedGametypes |= it.m_flags); } - if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_RACE) + if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_RACE.m_flags) if(!spawnplaces) { - MapInfo_Map_supportedGametypes &= ~MAPINFO_TYPE_RACE; - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CTS; + MapInfo_Map_supportedGametypes &= ~MAPINFO_TYPE_RACE.m_flags; + MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CTS.m_flags; } LOG_TRACE("-> diameter ", ftos(diameter)); LOG_TRACE("; spawnpoints ", ftos(spawnpoints)); - LOG_TRACE("; modes ", ftos(MapInfo_Map_supportedGametypes), "\n"); + LOG_TRACE("; modes ", ftos(MapInfo_Map_supportedGametypes)); fclose(fh); @@ -447,7 +422,7 @@ void _MapInfo_Map_Reset() MapInfo_Map_maxs = '0 0 0'; } -string _MapInfo_GetDefault(float t) +string _MapInfo_GetDefault(Gametype t) { switch(t) { @@ -472,11 +447,11 @@ string _MapInfo_GetDefault(float t) } } -void _MapInfo_Map_ApplyGametype(string s, int pWantedType, int pThisType, int load_default) +void _MapInfo_Map_ApplyGametype(string s, Gametype pWantedType, Gametype pThisType, int load_default) { string sa; - MapInfo_Map_supportedGametypes |= pThisType; - if(!(pThisType & pWantedType)) + MapInfo_Map_supportedGametypes |= pThisType.m_flags; + if(!(pThisType.m_flags & pWantedType.m_flags)) return; if(load_default) @@ -499,56 +474,14 @@ void _MapInfo_Map_ApplyGametype(string s, int pWantedType, int pThisType, int lo cvar_set("timelimit", sa); s = cdr(s); - if(pWantedType == MAPINFO_TYPE_TEAM_DEATHMATCH) - { - sa = car(s); - if(sa != "") - cvar_set("g_tdm_teams", sa); - s = cdr(s); - } - - if(pWantedType == MAPINFO_TYPE_KEYHUNT) - { - sa = car(s); - if(sa != "") - cvar_set("g_keyhunt_teams", sa); - s = cdr(s); - } - - if(pWantedType == MAPINFO_TYPE_CA) + if(pWantedType.m_setTeams) { sa = car(s); if(sa != "") - cvar_set("g_ca_teams", sa); + pWantedType.m_setTeams(sa); s = cdr(s); } - if(pWantedType == MAPINFO_TYPE_FREEZETAG) - { - sa = car(s); - if(sa != "") - cvar_set("g_freezetag_teams", sa); - s = cdr(s); - } - - if(pWantedType == MAPINFO_TYPE_CTF) - { - sa = car(s); - if(sa != "") - cvar_set("fraglimit", sa); - s = cdr(s); - } - - /* keepaway wuz here - if(pWantedType == MAPINFO_TYPE_KEEPAWAY) - { - sa = car(s); - if(sa != "") - cvar_set("fraglimit", sa); - s = cdr(s); - } - */ - // rc = timelimit timelimit_qualification laps laps_teamplay if(pWantedType == MAPINFO_TYPE_RACE) { @@ -569,19 +502,6 @@ void _MapInfo_Map_ApplyGametype(string s, int pWantedType, int pThisType, int lo s = cdr(s); } - if(pWantedType == MAPINFO_TYPE_CTS) - { - sa = car(s); - - // this is the skill of the map - // not parsed by anything yet - // for map databases - //if(sa != "") - // cvar_set("fraglimit", sa); - - s = cdr(s); - } - if(pWantedType == MAPINFO_TYPE_ASSAULT || pWantedType == MAPINFO_TYPE_ONSLAUGHT || pWantedType == MAPINFO_TYPE_CTS) // these modes don't use fraglimit { cvar_set("leadlimit", "0"); @@ -595,22 +515,20 @@ void _MapInfo_Map_ApplyGametype(string s, int pWantedType, int pThisType, int lo } } -string _MapInfo_GetDefaultEx(float t) +string _MapInfo_GetDefaultEx(Gametype t) { - FOREACH(Gametypes, it.items == t, return it.model2); - return ""; + return t ? t.model2 : ""; } -float _MapInfo_GetTeamPlayBool(float t) +float _MapInfo_GetTeamPlayBool(Gametype t) { - FOREACH(Gametypes, it.items == t, return it.team); - return false; + return t ? t.team : false; } -void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType) +void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThisType) { - MapInfo_Map_supportedGametypes |= pThisType; - if (!(pThisType & pWantedType)) + MapInfo_Map_supportedGametypes |= pThisType.m_flags; + if (!(pThisType.m_flags & pWantedType.m_flags)) return; // reset all the cvars to their defaults @@ -628,7 +546,8 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType) 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); + 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); @@ -667,8 +586,8 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType) } } 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 (!handled && !autocvar_g_mapinfo_ignore_warnings) + 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) @@ -683,18 +602,13 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType) } } -Gametype MapInfo_Type(int t) -{ - FOREACH(Gametypes, it.items == t, return it); - return NULL; -} - -int MapInfo_Type_FromString(string t) +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); \ + 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 @@ -704,31 +618,25 @@ int MapInfo_Type_FromString(string t) 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; + FOREACH(Gametypes, it.mdl == t, return it); + return NULL; #undef deprecate } -string MapInfo_Type_Description(float t) +string MapInfo_Type_Description(Gametype t) { - FOREACH(Gametypes, it.items == t, return it.gametype_description); - return ""; + return t ? t.gametype_description : ""; } -string MapInfo_Type_ToString(float t) +string MapInfo_Type_ToString(Gametype t) { - if(t == MAPINFO_TYPE_ALL) - return "all"; - FOREACH(Gametypes, it.items == t, return it.mdl); - return ""; + return t ? t.mdl : ""; } -string MapInfo_Type_ToText(float t) +string MapInfo_Type_ToText(Gametype t) { - FOREACH(Gametypes, it.items == t, return it.message); /* xgettext:no-c-format */ - return _("@!#%'n Tuba Throwing"); + return t ? t.message : _("@!#%'n Tuba Throwing"); } void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s, float recurse) @@ -770,7 +678,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 (;;) @@ -799,23 +707,23 @@ 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 { - LOG_TRACE("Applying temporary setting ", t, " := ", s, "\n"); + LOG_TRACE("Applying temporary setting ", t, " := ", s); if(cvar("g_campaign")) cvar_set(t, s); // this is a wrapper and is always temporary anyway; no need to backup old values then else @@ -823,7 +731,7 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s, } else { - LOG_TRACE("Applying temporary client setting ", t, " := ", s, "\n"); + LOG_TRACE("Applying temporary client setting ", t, " := ", s); MapInfo_Map_clientstuff = strcat( MapInfo_Map_clientstuff, "cl_cmd settemp \"", t, "\" \"", s, "\"\n" ); @@ -857,7 +765,7 @@ float MapInfo_isRedundant(string fn, string t) } // load info about a map by name into the MapInfo_Map_* globals -float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int pGametypeToSet) +float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gametype pGametypeToSet) { string fn; string s, t; @@ -870,11 +778,11 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p if(strstrofs(pFilename, "/", 0) >= 0) { - LOG_MAPWARN("Invalid character in map name, ignored\n"); + LOG_WARN("Invalid character in map name, ignored"); return 0; } - if(pGametypeToSet == 0) + if(pGametypeToSet == NULL) if(MapInfo_Cache_Retrieve(pFilename)) return 1; @@ -939,13 +847,16 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p if(MapInfo_Map_flags & MAPINFO_FLAG_FRUSTRATING) fputs(fh, "frustrating\n"); - for(i = 1; i <= MapInfo_Map_supportedGametypes; i *= 2) - if(MapInfo_Map_supportedGametypes & i) - fputs(fh, sprintf("gametype %s // defaults: %s\n", MapInfo_Type_ToString(i), _MapInfo_GetDefaultEx(i))); + FOREACH(Gametypes, MapInfo_Map_supportedGametypes & it.m_flags, { + fputs(fh, sprintf("gametype %s // defaults: %s\n", MapInfo_Type_ToString(it), _MapInfo_GetDefaultEx(it))); + }); if(fexists(strcat("scripts/", pFilename, ".arena"))) fputs(fh, "settemp_for_type all sv_q3acompat_machineshotgunswap 1\n"); + if(fexists(strcat("scripts/", pFilename, ".defi"))) + fputs(fh, "settemp_for_type all sv_vq3compat 1\n"); + fputs(fh, "// optional: fog density red green blue alpha mindist maxdist\n"); fputs(fh, "// optional: settemp_for_type (all|gametypename) cvarname value\n"); fputs(fh, "// optional: clientsettemp_for_type (all|gametypename) cvarname value\n"); @@ -960,7 +871,8 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p 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"); + 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(); @@ -999,7 +911,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_MAPWARN("Map ", pFilename, " supports unknown feature ", t, ", ignored\n"); + LOG_WARN("Map ", pFilename, " supports unknown feature ", t, ", ignored"); } else if(t == "hidden") { @@ -1025,21 +937,22 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p else if(t == "type") { t = car(s); s = cdr(s); - 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"); + 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(f) _MapInfo_Map_ApplyGametype (s, pGametypeToSet, f, true); - else - LOG_MAPWARN("Map ", pFilename, " supports unknown game type ", t, ", ignored\n"); + else if(!autocvar_g_mapinfo_ignore_warnings) + LOG_DEBUG("Map ", pFilename, " supports unknown game type ", t, ", ignored"); } else if(t == "gametype") { t = car(s); s = cdr(s); - f = MapInfo_Type_FromString(t); + Gametype f = MapInfo_Type_FromString(t); if(f) _MapInfo_Map_ApplyGametypeEx (s, pGametypeToSet, f); - else - LOG_MAPWARN("Map ", pFilename, " supports unknown game type ", t, ", ignored\n"); + else if(!autocvar_g_mapinfo_ignore_warnings) + LOG_DEBUG("Map ", pFilename, " supports unknown game type ", t, ", ignored"); } else if(t == "size") { @@ -1050,16 +963,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_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; @@ -1075,37 +988,41 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p else if(t == "settemp_for_type") { t = car(s); s = cdr(s); - if((f = MapInfo_Type_FromString(t))) + bool all = t == "all"; + Gametype f = NULL; + if(all || (f = MapInfo_Type_FromString(t))) { - if(f & pGametypeToSet) + 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_DEBUG("Map ", pFilename, " has a setting for unknown game type ", t, ", ignored"); } } else if(t == "clientsettemp_for_type") { t = car(s); s = cdr(s); - if((f = MapInfo_Type_FromString(t))) + bool all = t == "all"; + Gametype f = NULL; + if(all || (f = MapInfo_Type_FromString(t))) { - if(f & pGametypeToSet) + 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_DEBUG("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; } @@ -1121,15 +1038,15 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p 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" ); } } - else - LOG_MAPWARN("Map ", pFilename, " provides unknown info item ", t, ", ignored\n"); + else if(!autocvar_g_mapinfo_ignore_warnings) + LOG_WARN("Map ", pFilename, " provides unknown info item ", t, ", ignored"); } fclose(fh); @@ -1143,24 +1060,29 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p 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; } -float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, int pGametypeToSet) +int MapInfo_Get_ByName(string pFilename, float pAllowGenerate, Gametype pGametypeToSet) { - float r = MapInfo_Get_ByName_NoFallbacks(pFilename, pAllowGenerate, pGametypeToSet); + int r = MapInfo_Get_ByName_NoFallbacks(pFilename, pAllowGenerate, pGametypeToSet); + + // force all DM maps to work in duel?! + // TODO: we should really check the size of maps, some DM maps do not work for duel! + if(!(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DUEL.m_flags) && (MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DEATHMATCH.m_flags)) + _MapInfo_Map_ApplyGametypeEx ("", pGametypeToSet, MAPINFO_TYPE_DUEL); if(cvar("g_tdm_on_dm_maps")) { // if this is set, all DM maps support TDM too - if (!(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_TEAM_DEATHMATCH)) - if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DEATHMATCH) + if (!(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_TEAM_DEATHMATCH.m_flags)) + if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DEATHMATCH.m_flags) _MapInfo_Map_ApplyGametypeEx ("", pGametypeToSet, MAPINFO_TYPE_TEAM_DEATHMATCH); } if(pGametypeToSet) { - if(!(MapInfo_Map_supportedGametypes & pGametypeToSet)) + if(!(MapInfo_Map_supportedGametypes & pGametypeToSet.m_flags)) { error("Can't select the requested game type. This should never happen as the caller should prevent it!\n"); //_MapInfo_Map_ApplyGametypeEx("", pGametypeToSet, MAPINFO_TYPE_DEATHMATCH); @@ -1233,20 +1155,21 @@ int MapInfo_CurrentFeatures() return req; } -int MapInfo_CurrentGametype() +Gametype MapInfo_CurrentGametype() { - int prev = cvar("gamecfg"); - FOREACH(Gametypes, cvar(it.netname) && it.items != prev, return it.items); - if (prev) return prev; - return MAPINFO_TYPE_DEATHMATCH; + Gametype prev = Gametypes_from(cvar("gamecfg")); + 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, 0)) + if(!MapInfo_Get_ByName(s, 1, NULL)) return 0; - if((MapInfo_Map_supportedGametypes & MapInfo_CurrentGametype()) == 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; @@ -1255,14 +1178,14 @@ 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; } -void MapInfo_SwitchGameType(int t) +void MapInfo_SwitchGameType(Gametype t) { - FOREACH(Gametypes, true, cvar_set(it.netname, (it.items == t) ? "1" : "0")); + FOREACH(Gametypes, true, cvar_set(it.netname, (it == t) ? "1" : "0")); } void MapInfo_LoadMap(string s, float reinit) @@ -1272,9 +1195,11 @@ void MapInfo_LoadMap(string s, float reinit) //if(!MapInfo_CheckMap(s)) //{ // print("EMERGENCY: can't play the selected map in the given game mode. Falling back to DM.\n"); - // MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH); + // MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH.m_flags); //} + LOG_INFO("Switching to map ", s); + cvar_settemp_restore(); if(reinit) localcmd(strcat("\nmap ", s, "\n")); @@ -1282,17 +1207,16 @@ void MapInfo_LoadMap(string s, float reinit) localcmd(strcat("\nchangelevel ", s, "\n")); } -string MapInfo_ListAllowedMaps(float type, float pRequiredFlags, float pForbiddenFlags) +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); } @@ -1300,14 +1224,13 @@ string MapInfo_ListAllowedMaps(float type, float pRequiredFlags, float pForbidde 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); + _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); @@ -1315,49 +1238,52 @@ string MapInfo_ListAllAllowedMaps(float pRequiredFlags, float pForbiddenFlags) return substring(out, 1, strlen(out) - 1); } -void MapInfo_LoadMapSettings_SaveGameType(float t) +void MapInfo_LoadMapSettings_SaveGameType(Gametype t) { MapInfo_SwitchGameType(t); - cvar_set("gamecfg", ftos(t)); + cvar_set("gamecfg", ftos(t.m_id)); MapInfo_LoadedGametype = t; } void MapInfo_LoadMapSettings(string s) // to be called from worldspawn { - float t; - - t = MapInfo_CurrentGametype(); + 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")) { - LOG_SEVERE("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."); _MapInfo_Map_ApplyGametypeEx("", t, t); return; // do not call Get_ByName! } if(MapInfo_Map_supportedGametypes == 0) { - LOG_SEVERE("Mapinfo system is not functional at all. Assuming deathmatch.\n"); - MapInfo_Map_supportedGametypes = MAPINFO_TYPE_DEATHMATCH; + LOG_SEVERE("Mapinfo system is not functional at all. Assuming deathmatch."); + MapInfo_Map_supportedGametypes = MAPINFO_TYPE_DEATHMATCH.m_flags; MapInfo_LoadMapSettings_SaveGameType(MAPINFO_TYPE_DEATHMATCH); _MapInfo_Map_ApplyGametypeEx("", MAPINFO_TYPE_DEATHMATCH, MAPINFO_TYPE_DEATHMATCH); return; // do not call Get_ByName! } - t = 1; + int _t = 1; while(!(MapInfo_Map_supportedGametypes & 1)) { - t *= 2; - MapInfo_Map_supportedGametypes = floor(MapInfo_Map_supportedGametypes / 2); + _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_WARNING("can't play the selected map in the given game mode. Falling back to a supported mode.\n"); + 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); } @@ -1390,7 +1316,7 @@ int MapInfo_ForbiddenFlags() { int f = MAPINFO_FLAG_FORBIDDEN; -#ifndef MENUQC +#ifdef GAMEQC if (!cvar("g_maplist_allow_hidden")) #endif f |= MAPINFO_FLAG_HIDDEN;