+#include "mapinfo.qh"
#if defined(CSQC)
#include "../client/defs.qh"
#include "util.qh"
- #include <common/weapons/all.qh>
- #include "mapinfo.qh"
+ #include <common/weapons/_all.qh>
#elif defined(MENUQC)
#elif defined(SVQC)
#include "util.qh"
- #include <common/monsters/all.qh>
- #include "mapinfo.qh"
+ #include <common/monsters/_mod.qh>
#endif
+bool autocvar_g_mapinfo_ignore_warnings;
+
// generic string stuff
int _MapInfo_Cache_Active;
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 != "\"")
}
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;
}
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);
int twoBaseModes = 0;
- FOREACH(Gametypes, it.m_isTwoBaseMode(), twoBaseModes |= it.m_flags);
+ 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.m_flags; // DM always works
- MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_LMS.m_flags; // LMS always works
- MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_KEEPAWAY.m_flags; // Keepaway always works
-
- if(spawnpoints >= 8 && diameter > 4096) {
- MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_TEAM_DEATHMATCH.m_flags;
- MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_FREEZETAG.m_flags;
- MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CA.m_flags;
- }
- if(spawnpoints >= 12 && diameter > 5120)
- MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_KEYHUNT.m_flags;
+ FOREACH(Gametypes, it.m_isAlwaysSupported(it, spawnpoints, diameter), MapInfo_Map_supportedGametypes |= it.m_flags);
}
if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_RACE.m_flags)
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)
- {
- sa = car(s);
- if(sa != "")
- cvar_set("g_ca_teams", sa);
- s = cdr(s);
- }
-
- if(pWantedType == MAPINFO_TYPE_FREEZETAG)
+ if(pWantedType.m_setTeams)
{
sa = car(s);
if(sa != "")
- cvar_set("g_freezetag_teams", sa);
+ pWantedType.m_setTeams(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)
{
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");
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);
}
}
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)
#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
{
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 (;;)
}
}
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
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(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");
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();
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")
{
{
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");
+ //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")
{
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")
{
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;
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_DEBUG("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_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;
}
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);
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)
{
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
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;
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;
}
// MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH.m_flags);
//}
+ LOG_INFO("Switching to map ", s);
+
cvar_settemp_restore();
if(reinit)
localcmd(strcat("\nmap ", s, "\n"));
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);
}
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);
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"))
{
_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);
}
{
int f = MAPINFO_FLAG_FORBIDDEN;
-#ifndef MENUQC
+#ifdef GAMEQC
if (!cvar("g_maplist_allow_hidden"))
#endif
f |= MAPINFO_FLAG_HIDDEN;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff