+#include "mapinfo.qh"
+#if defined(CSQC)
+ #include "../client/defs.qh"
+ #include "util.qh"
+ #include <common/weapons/_all.qh>
+#elif defined(MENUQC)
+#elif defined(SVQC)
+ #include "util.qh"
+ #include <common/monsters/_mod.qh>
+#endif
+
+bool autocvar_g_mapinfo_ignore_warnings;
+
// generic string stuff
-float _MapInfo_Cache_Active;
-float _MapInfo_Cache_DB_NameToIndex;
-float _MapInfo_Cache_Buf_IndexToMapData;
+int _MapInfo_Cache_Active;
+int _MapInfo_Cache_DB_NameToIndex;
+int _MapInfo_Cache_Buf_IndexToMapData;
void MapInfo_Cache_Destroy()
{
_MapInfo_globopen = 0;
}
MapInfo_Cache_Invalidate();
- _MapInfo_globhandle = search_begin("maps/*.bsp", TRUE, TRUE);
+ _MapInfo_globhandle = search_begin("maps/*.bsp", true, true);
if(_MapInfo_globhandle >= 0)
{
_MapInfo_globcount = search_getsize(_MapInfo_globhandle);
return strcasecmp(a, b);
}
-float MapInfo_FilterGametype(float pGametype, float pFeatures, float pFlagsRequired, float pFlagsForbidden, float 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)
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)
{
- dprint("Autogenerated a .mapinfo, doing the rest later.\n");
+ LOG_TRACE("Autogenerated a .mapinfo, doing the rest later.");
MapInfo_progress = i / _MapInfo_globcount;
return 0;
}
MapInfo_ClearTemps();
// sometimes the glob isn't sorted nicely, so fix it here...
- heapsort(MapInfo_count, _MapInfo_FilterList_swap, _MapInfo_FilterList_cmp, world);
+ heapsort(MapInfo_count, _MapInfo_FilterList_swap, _MapInfo_FilterList_cmp, NULL);
return 1;
}
+void MapInfo_FilterString(string sf)
+{
+ // this function further filters _MapInfo_filtered, which is prepared by MapInfo_FilterGametype by string
+ float i, j;
+ string title;
+
+ for(i = 0, j = -1; i < MapInfo_count; ++i)
+ {
+ if (MapInfo_Get_ByID(i))
+ {
+ // prepare for keyword filter
+ if (MapInfo_Map_title && strstrofs(MapInfo_Map_title, "<TITLE>", 0) == -1)
+ title = MapInfo_Map_title;
+ else
+ title = MapInfo_Map_bspname;
+ // keyword filter
+ if((strstrofs(strtolower(title), strtolower(sf), 0)) >= 0)
+ bufstr_set(_MapInfo_filtered, ++j, bufstr_get(_MapInfo_filtered, i));
+ }
+ }
+ MapInfo_count = j + 1;
+ MapInfo_ClearTemps();
+
+ // sometimes the glob isn't sorted nicely, so fix it here...
+ heapsort(MapInfo_count, _MapInfo_FilterList_swap, _MapInfo_FilterList_cmp, NULL);
+}
void MapInfo_Filter_Free()
{
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 != "\"")
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;
}
float i;
float inWorldspawn;
float r;
- float twoBaseModes;
float diameter, spawnpoints;
float spawnplaces;
}
if(fh < 0)
return 0;
- print("Analyzing ", fn, " to generate initial mapinfo\n");
+ LOG_INFO("Analyzing ", fn, " to generate initial mapinfo");
inWorldspawn = 2;
MapInfo_Map_flags = 0;
mapMins = '0 0 0';
mapMaxs = '0 0 0';
- for(;;)
+ for (;;)
{
if (!((s = fgets(fh))))
break;
if(k == "origin")
{
o = stov(strcat("'", v, "'"));
- mapMins_x = min(mapMins_x, o_x);
- mapMins_y = min(mapMins_y, o_y);
- mapMins_z = min(mapMins_z, o_z);
- mapMaxs_x = max(mapMaxs_x, o_x);
- mapMaxs_y = max(mapMaxs_y, o_y);
- mapMaxs_z = max(mapMaxs_z, o_z);
+ mapMins.x = min(mapMins.x, o.x);
+ mapMins.y = min(mapMins.y, o.y);
+ mapMins.z = min(mapMins.z, o.z);
+ mapMaxs.x = max(mapMaxs.x, o.x);
+ mapMaxs.y = max(mapMaxs.y, o.y);
+ mapMaxs.z = max(mapMaxs.z, o.z);
}
else if(k == "race_place")
{
}
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;
++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")
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)
{
- print(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;
}
- dprint("-> diameter ", ftos(diameter));
- dprint("; spawnpoints ", ftos(spawnpoints));
- dprint("; modes ", ftos(MapInfo_Map_supportedGametypes), "\n");
+ LOG_TRACE("-> diameter ", ftos(diameter));
+ LOG_TRACE("; spawnpoints ", ftos(spawnpoints));
+ LOG_TRACE("; modes ", ftos(MapInfo_Map_supportedGametypes));
fclose(fh);
MapInfo_Map_maxs = '0 0 0';
}
-string _MapInfo_GetDefault(float t)
+string _MapInfo_GetDefault(Gametype t)
{
switch(t)
{
}
}
-void _MapInfo_Map_ApplyGametype(string s, float pWantedType, float pThisType, float 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)
- _MapInfo_Map_ApplyGametype(_MapInfo_GetDefault(pThisType), pWantedType, pThisType, FALSE);
+ _MapInfo_Map_ApplyGametype(_MapInfo_GetDefault(pThisType), pWantedType, pThisType, false);
if(pWantedType == MAPINFO_TYPE_ASSAULT || pWantedType == MAPINFO_TYPE_ONSLAUGHT || pWantedType == MAPINFO_TYPE_RACE || pWantedType == MAPINFO_TYPE_CTS) // these modes don't use fraglimit
{
cvar_set("timelimit", sa);
s = cdr(s);
- if(pWantedType == MAPINFO_TYPE_TEAM_DEATHMATCH)
+ if(pWantedType.m_setTeams)
{
sa = car(s);
if(sa != "")
- cvar_set("g_tdm_teams", sa);
+ pWantedType.m_setTeams(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)
- {
- 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)
{
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");
}
}
-string _MapInfo_GetDefaultEx(float t)
+string _MapInfo_GetDefaultEx(Gametype t)
{
- entity e;
- for(e = MapInfo_Type_first; e; e = e.enemy)
- if(t == e.items)
- return e.model2;
- return "";
+ return t ? t.model2 : "";
}
-void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
+float _MapInfo_GetTeamPlayBool(Gametype t)
{
- string sa, k, v;
- float p;
- string fraglimit_normal;
- string fraglimit_teams;
+ return t ? t.team : false;
+}
- MapInfo_Map_supportedGametypes |= pThisType;
- if(!(pThisType & pWantedType))
+void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThisType)
+{
+ MapInfo_Map_supportedGametypes |= pThisType.m_flags;
+ if (!(pThisType.m_flags & pWantedType.m_flags))
return;
// reset all the cvars to their defaults
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);
-
- if(sa == "")
- continue;
-
- p = strstrofs(sa, "=", 0);
- if(p < 0)
- {
- print("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
+ FOREACH(Gametypes, true, it.m_parse_mapinfo(string_null, string_null));
+
+ string fraglimit_normal = string_null;
+ string fraglimit_teams = string_null;
+
+ 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) {
+ if(!autocvar_g_mapinfo_ignore_warnings)
+ LOG_WARNF("Invalid gametype setting in mapinfo for gametype %s: %s", 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
- {
- print("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 && !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)
+ if (pWantedType == MAPINFO_TYPE_RACE && cvar("g_race_teams") >= 2)
{
if(fraglimit_teams)
cvar_set("fraglimit", fraglimit_teams);
}
}
-float MapInfo_Type_FromString(string t)
+Gametype MapInfo_Type_FromString(string t)
{
- entity e;
- if(t == "nexball")
- {
- print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
- t = "nb";
- print("'. Should use '", t, "'.\n");
- }
- if(t == "freezetag")
- {
- print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
- t = "ft";
- print("'. Should use '", t, "'.\n");
- }
- if(t == "keepaway")
- {
- print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
- t = "ka";
- print("'. Should use '", t, "'.\n");
- }
- if(t == "invasion")
- {
- print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
- t = "inv";
- print("'. Should use '", t, "'.\n");
- }
- if(t == "assault")
- {
- print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
- t = "as";
- print("'. Should use '", t, "'.\n");
- }
- if(t == "race")
- {
- print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
- t = "rc";
- print("'. Should use '", t, "'.\n");
- }
- if(t == "all")
- return MAPINFO_TYPE_ALL;
- for(e = MapInfo_Type_first; e; e = e.enemy)
- if(t == e.mdl)
- return e.items;
- return 0;
+#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
+ deprecate(nexball, nb);
+ deprecate(freezetag, ft);
+ deprecate(keepaway, ka);
+ deprecate(invasion, inv);
+ deprecate(assault, as);
+ deprecate(race, rc);
+ FOREACH(Gametypes, it.mdl == t, return it);
+ return NULL;
+#undef deprecate
}
-string MapInfo_Type_Description(float t)
+string MapInfo_Type_Description(Gametype t)
{
- entity e;
- for(e = MapInfo_Type_first; e; e = e.enemy)
- if(t == e.items)
- return e.gametype_description;
- return "";
+ return t ? t.gametype_description : "";
}
-string MapInfo_Type_ToString(float t)
+string MapInfo_Type_ToString(Gametype t)
{
- entity e;
- if(t == MAPINFO_TYPE_ALL)
- return "all";
- for(e = MapInfo_Type_first; e; e = e.enemy)
- if(t == e.items)
- return e.mdl;
- return "";
+ return t ? t.mdl : "";
}
-string MapInfo_Type_ToText(float t)
+string MapInfo_Type_ToText(Gametype t)
{
- entity e;
- for(e = MapInfo_Type_first; e; e = e.enemy)
- if(t == e.items)
- return e.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)
{
fh = fopen(s, FILE_READ);
if(fh < 0)
- print("Map ", pFilename, " references not existing config file ", s, "\n");
+ LOG_WARN("Map ", pFilename, " references not existing config file ", s);
else
{
- for(;;)
+ for (;;)
{
if (!((s = fgets(fh))))
break;
}
}
else
- print("Map ", pFilename, " uses too many levels of inclusion\n");
+ LOG_WARN("Map ", pFilename, " uses too many levels of inclusion");
}
else if(t == "")
- print("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))
- print("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))
- print("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)
- print("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)
- print("Map ", pFilename, " contains a denied setting, ignored\n");
+ LOG_WARN("Map ", pFilename, " contains a denied setting, ignored");
else
{
if(type == 0) // server set
{
- dprint("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
}
else
{
- dprint("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"
);
t = strreplace("'", "-", t);
if(!strcasecmp(fn, t))
- return TRUE;
+ return true;
// we allow the visible title to have punctuation the file name does
// not, but not vice versa
t = strreplace("-", "", t);
if(!strcasecmp(fn, t))
- return TRUE;
+ return true;
- return FALSE;
+ return false;
}
// load info about a map by name into the MapInfo_Map_* globals
-float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, float pGametypeToSet)
+float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gametype pGametypeToSet)
{
string fn;
string s, t;
float fh;
- float r, f, n, i, p;
+ int f, i;
+ float r, n, p;
string acl;
acl = MAPINFO_SETTEMP_ACL_USER;
if(strstrofs(pFilename, "/", 0) >= 0)
{
- print("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;
{
n = tokenize_console(cvar_string("g_cdtracks_remaplist"));
s = strcat(" ", cvar_string("g_cdtracks_dontusebydefault"), " ");
- for(;;)
+ for (;;)
{
i = floor(random() * n);
if(strstrofs(s, strcat(" ", argv(i), " "), 0) < 0)
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");
error("... but I just wrote it!");
}
- print("WARNING: 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();
- for(;;)
+ for (;;)
{
if (!((s = fgets(fh))))
break;
else if(t == "monsters") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_MONSTERS;
else if(t == "new_toys") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_WEAPONS;
else
- dprint("Map ", pFilename, " supports unknown feature ", t, ", ignored\n");
+ LOG_WARN("Map ", pFilename, " supports unknown feature ", t, ", ignored");
}
else if(t == "hidden")
{
{
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);
- dprint("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
- dprint("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
+ _MapInfo_Map_ApplyGametype (s, pGametypeToSet, f, true);
+ 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
- dprint("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 == "")
- print("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 != "")
- print("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)
- print("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;
- MapInfo_Map_mins_y = b;
- MapInfo_Map_mins_z = c;
- MapInfo_Map_maxs_x = d;
- MapInfo_Map_maxs_y = e;
- MapInfo_Map_maxs_z = f;
+ MapInfo_Map_mins.x = a;
+ MapInfo_Map_mins.y = b;
+ MapInfo_Map_mins.z = c;
+ MapInfo_Map_maxs.x = d;
+ MapInfo_Map_maxs.y = e;
+ MapInfo_Map_maxs.z = f;
}
}
}
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
{
- dprint("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
{
- dprint("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))
- print("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;
}
else if(t == "cdtrack")
{
t = car(s); s = cdr(s);
- if(pGametypeToSet) // FIXME is this check right here?
+ // We do this only if pGametypeToSet even though this
+ // content is theoretically game type independent,
+ // because MapInfo_Map_clientstuff contains otherwise
+ // game type dependent stuff. That way this value stays
+ // empty when not setting a game type to not set any
+ // false expectations.
+ if(pGametypeToSet)
{
if (!cvar_value_issafe(t))
- print("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
- dprint("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);
else if(MapInfo_isRedundant(MapInfo_Map_bspname, MapInfo_Map_title))
MapInfo_Map_titlestring = MapInfo_Map_title;
else
- MapInfo_Map_titlestring = sprintf(_("%s: %s"), MapInfo_Map_bspname, MapInfo_Map_title);
+ MapInfo_Map_titlestring = sprintf("%s: %s", MapInfo_Map_bspname, MapInfo_Map_title);
MapInfo_Cache_Store();
if(MapInfo_Map_supportedGametypes != 0)
return r;
- dprint("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, float 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);
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);
return MapInfo_FindName_match;
}
-float MapInfo_CurrentFeatures()
+int MapInfo_CurrentFeatures()
{
- float req;
- req = 0;
- if(!(cvar("g_lms") || cvar("g_instagib") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") || cvar("g_race") || cvar("g_cts") || cvar("g_nexball")))
+ int req = 0;
+ if(!(cvar("g_lms") || cvar("g_instagib") || cvar("g_overkill") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") || cvar("g_race") || cvar("g_cts") || cvar("g_nexball")))
req |= MAPINFO_FEATURE_WEAPONS;
return req;
}
-float MapInfo_CurrentGametype()
+Gametype MapInfo_CurrentGametype()
{
- float prev;
- entity e;
- prev = cvar("gamecfg");
- for(e = MapInfo_Type_first; e; e = e.enemy)
- if(cvar(e.netname))
- if(prev != e.items)
- return e.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;
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(float t)
+void MapInfo_SwitchGameType(Gametype t)
{
- entity e;
- for(e = MapInfo_Type_first; e; e = e.enemy)
- cvar_set(e.netname, (t == e.items) ? "1" : "0");
+ FOREACH(Gametypes, true, cvar_set(it.netname, (it == t) ? "1" : "0"));
}
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"));
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);
}
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);
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"))
{
- print("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.");
_MapInfo_Map_ApplyGametypeEx("", t, t);
return; // do not call Get_ByName!
}
if(MapInfo_Map_supportedGametypes == 0)
{
- print("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!
- print("EMERGENCY: 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);
}
{
search_end(_MapInfo_globhandle);
_MapInfo_globhandle = -1;
- _MapInfo_globopen = FALSE;
+ _MapInfo_globopen = false;
}
}
-float MapInfo_ForbiddenFlags()
+int MapInfo_ForbiddenFlags()
{
- float f;
- f = MAPINFO_FLAG_FORBIDDEN;
+ int f = MAPINFO_FLAG_FORBIDDEN;
-#ifndef MENUQC
+#ifdef GAMEQC
if (!cvar("g_maplist_allow_hidden"))
#endif
f |= MAPINFO_FLAG_HIDDEN;
return f;
}
-float MapInfo_RequiredFlags()
+int MapInfo_RequiredFlags()
{
- float f;
- f = 0;
+ int f = 0;
if(cvar("g_maplist_allow_frustrating") > 1)
f |= MAPINFO_FLAG_FRUSTRATING;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff