#include "mapinfo.qh"
#if defined(CSQC)
- #include "../client/defs.qh"
- #include "util.qh"
- #include <common/weapons/_all.qh>
+ #include <common/util.qh>
+ #include <common/weapons/_all.qh>
#elif defined(MENUQC)
#elif defined(SVQC)
- #include "util.qh"
- #include <common/monsters/_mod.qh>
+ #include <common/util.qh>
+ #include <common/monsters/_mod.qh>
#endif
+bool autocvar_g_mapinfo_arena_compat = true;
+bool autocvar_g_mapinfo_arena_generate = false;
+
#ifdef MENUQC
#define WARN_COND false
#else
return "";
}
-float MapInfo_Get_ByID(float i)
+bool MapInfo_Get_ByID(int i)
{
- if(MapInfo_Get_ByName(MapInfo_BSPName_ByID(i), 0, NULL))
- return 1;
- return 0;
+ return MapInfo_Get_ByName(MapInfo_BSPName_ByID(i), 0, NULL) ? true : false;
}
string _MapInfo_Map_worldspawn_music;
mapMins = '0 0 0';
mapMaxs = '0 0 0';
+ if(autocvar_g_mapinfo_arena_generate)
+ {
+ // try for .arena or .defi files, as they may have more accurate information
+ bool isdefi = false;
+ string arena_fn = _MapInfo_FindArenaFile(pFilename, ".arena");
+ int arena_fh = fopen(arena_fn, FILE_READ);
+ if(arena_fh < 0)
+ {
+ isdefi = true;
+ arena_fn = _MapInfo_FindArenaFile(pFilename, ".defi");
+ arena_fh = fopen(arena_fn, FILE_READ);
+ }
+ if(arena_fh >= 0)
+ {
+ _MapInfo_ParseArena(arena_fn, arena_fh, pFilename, NULL, isdefi, true);
+ fclose(arena_fh);
+ }
+ }
+
for (;;)
{
if (!((s = fgets(fh))))
}
}
-Gametype MapInfo_Type_FromString(string gtype)
+Gametype MapInfo_Type_FromString(string gtype, bool dowarn, bool is_q3compat)
{
string replacement = "";
bool do_warn = true;
case "ffa": replacement = "dm"; do_warn = false; break;
case "cctf":
case "oneflag": replacement = "ctf"; do_warn = false; break;
- case "team": replacement = "tdm"; do_warn = false; break;
case "tourney": replacement = "duel"; do_warn = false; break;
+ case "arena": if(is_q3compat) { replacement = "ca"; do_warn = false; } break;
}
if (replacement != "")
{
- if(do_warn && WARN_COND)
+ if (dowarn && WARN_COND)
LOG_WARNF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.", MapInfo_Map_bspname, gtype, replacement);
gtype = replacement;
}
return false;
}
-bool _MapInfo_ParseArena(int fh, string pFilename, Gametype pGametypeToSet, bool isdefi)
+bool _MapInfo_ParseArena(string arena_filename, int fh, string pFilename, Gametype pGametypeToSet, bool isdefi, bool isgenerator)
{
// NOTE: .arena files can hold more than 1 map's information!
// to handle this, we're going to store gathered information in local variables and save it if we encounter the correct map name
- bool testing_map = false; // testing a potential mapinfo section (within brackets)
- bool dosave = false; // variables will be stored in map info upon reaching finishing bracket
+ bool in_brackets = false; // testing a potential mapinfo section (within brackets)
+ bool dosave = (arena_filename == strcat("scripts/", pFilename, ((isdefi) ? ".defi" : ".arena"))); // if the map is using the fallback, just accept the first found mapinfo (it's probably correct!)
string stored_Map_description = "";
string stored_Map_title = "";
+ string stored_Map_author = "";
int stored_supportedGametypes = 0;
+ int stored_supportedFeatures = 0;
+ int stored_flags = 0;
string t, s;
for (;;)
{
continue;
if(substring(s, 0, 1) == "_") // q3map style
continue;
- if(s == "{")
+ if(strstrofs(s, "{", 0) >= 0)
{
- if(testing_map)
+ if(in_brackets)
return false; // edge case? already in a bracketed section!
- testing_map = true;
+ in_brackets = true;
continue;
}
- if(s == "}" || s == " }") // check for a space (common practice in kool maps)
+ else if(!in_brackets)
{
- if(!testing_map)
+ // if we're not inside a bracket, don't process map info
+ continue;
+ }
+ if(strstrofs(s, "}", 0) >= 0)
+ {
+ if(!in_brackets)
return false; // no starting bracket! let the mapinfo generation system handle it
- testing_map = false;
+ in_brackets = false;
if(dosave)
{
- if(stored_Map_description != "")
- MapInfo_Map_description = stored_Map_description;
+ MapInfo_Map_description = stored_Map_description;
if(stored_Map_title != "")
MapInfo_Map_title = stored_Map_title;
- FOREACH(Gametypes, it.m_flags & stored_supportedGametypes,
+ MapInfo_Map_author = stored_Map_author;
+ if(isgenerator)
+ MapInfo_Map_supportedGametypes = stored_supportedGametypes;
+ else
{
- _MapInfo_Map_ApplyGametype ("", pGametypeToSet, it, true);
- });
+ FOREACH(Gametypes, it.m_flags & stored_supportedGametypes,
+ {
+ _MapInfo_Map_ApplyGametype ("", pGametypeToSet, it, true);
+ });
+ }
+ MapInfo_Map_supportedFeatures = stored_supportedFeatures;
+ MapInfo_Map_flags = stored_flags;
return true; // no need to continue through the file, we have our map!
}
else
// discard any gathered locals, we're not using the correct map!
stored_Map_description = "";
stored_Map_title = "";
+ stored_Map_author = "";
stored_supportedGametypes = 0;
+ stored_supportedFeatures = 0;
+ stored_flags = 0;
continue;
}
}
if(p >= 0)
s = substring(s, 0, p);
+ // perform an initial trim to ensure the first argument is properly obtained
+ // remove leading spaces
+ while(substring(s, 0, 1) == " ")
+ s = substring(s, 1, -1);
+
t = car(s); s = cdr(s);
+ t = strtolower(t); // apparently some q3 maps use capitalized parameters
+
+ // remove trailing spaces
+ while(substring(t, -1, 1) == " ")
+ t = substring(t, 0, -2);
+
// remove trailing spaces
while(substring(s, -1, 1) == " ")
s = substring(s, 0, -2);
s = substring(s, 1, -2);
}
if(t == "longname")
- {
- // in .defi files, this is the description, whereas in .arena files, this is generally the title
- if(isdefi)
- stored_Map_description = s;
- else
- stored_Map_title = s;
- }
+ stored_Map_title = s;
else if(t == "author")
- MapInfo_Map_author = s;
+ stored_Map_author = s;
else if(t == "type")
{
// if there is a valid gametype in this .arena file, include it in the menu
- MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_WEAPONS;
+ stored_supportedFeatures |= MAPINFO_FEATURE_WEAPONS;
// type in quake 3 holds all the supported gametypes, so we must loop through all of them
- FOREACH_WORD(s, true,
+ string types = strreplace("team", "tdm ft", s); // TODO: handle support here better to include more Xonotic teamplay modes
+ FOREACH_WORD(types, true,
{
- Gametype f = MapInfo_Type_FromString(it);
+ Gametype f = MapInfo_Type_FromString(it, false, true);
if(f)
stored_supportedGametypes |= f.m_flags;
});
if(strtolower(s) == strtolower(pFilename))
dosave = true; // yay, found our map!
}
+ else if(t == "quote")
+ stored_Map_description = s;
// TODO: fraglimit
}
- // didn't find a closing bracket, uh oh!
- // nothing has been saved anyway, let's abort and use generated mapinfo
- if(testing_map)
- return false;
- return true;
+ // if the map wasn't found in the .arena, fall back to generated .mapinfo
+ return false;
}
#if defined(CSQC) || defined(MENUQC)
#endif
string _MapInfo_FindArenaFile(string pFilename, string extension)
{
- string base_pack = whichpack(strcat("maps/", pFilename, ".bsp"));
string fallback = strcat("scripts/", pFilename, extension);
+ if(!checkextension("DP_QC_FS_SEARCH_PACKFILE"))
+ return fallback;
+ string base_pack = whichpack(strcat("maps/", pFilename, ".bsp"));
if(base_pack == "") // this map isn't packaged!
return fallback;
- int glob = search_begin(strcat("scripts/*", extension), true, true);
+ int glob = search_packfile_begin(strcat("scripts/*", extension), true, true, base_pack);
if(glob < 0)
return fallback;
int n = search_getsize(glob);
for(int j = 0; j < n; ++j)
{
string file = search_getfilename(glob, j);
- if(whichpack(file) != base_pack)
- continue; // not in the same pk3!
int fh = fopen(file, FILE_READ);
if(fh < 0)
fh = fopen(fn, FILE_READ);
if(fh < 0)
{
- bool isdefi = false;
- // try for a .arena or .defi file if no .mapinfo exists
- fn = _MapInfo_FindArenaFile(pFilename, ".arena");
- fh = fopen(fn, FILE_READ);
- if(fh < 0)
+ if(autocvar_g_mapinfo_arena_compat)
{
- isdefi = true;
- fn = _MapInfo_FindArenaFile(pFilename, ".defi");
+ // try for .arena or .defi files if no .mapinfo exists
+ bool isdefi = false;
+ fn = _MapInfo_FindArenaFile(pFilename, ".arena");
fh = fopen(fn, FILE_READ);
- }
- if(fh >= 0)
- {
- _MapInfo_Map_Reset();
- if(_MapInfo_ParseArena(fh, pFilename, pGametypeToSet, isdefi))
- goto mapinfo_handled; // skip generation
+ if(fh < 0)
+ {
+ isdefi = true;
+ fn = _MapInfo_FindArenaFile(pFilename, ".defi");
+ fh = fopen(fn, FILE_READ);
+ }
+ if(fh >= 0)
+ {
+ _MapInfo_Map_Reset();
+ if(_MapInfo_ParseArena(fn, fh, pFilename, pGametypeToSet, isdefi, false))
+ goto mapinfo_handled; // skip generation
+ }
}
fn = strcat("maps/autogenerated/", pFilename, ".mapinfo");
else if(t == "type")
{
t = car(s); s = cdr(s);
- Gametype f = MapInfo_Type_FromString(t);
+ Gametype f = MapInfo_Type_FromString(t, true, false);
//if(WARN_COND)
//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)
else if(t == "gametype")
{
t = car(s); s = cdr(s);
- Gametype f = MapInfo_Type_FromString(t);
+ Gametype f = MapInfo_Type_FromString(t, true, false);
if(f)
_MapInfo_Map_ApplyGametypeEx (s, pGametypeToSet, f);
else if(WARN_COND)
t = car(s); s = cdr(s);
bool all = t == "all";
Gametype f = NULL;
- if(all || (f = MapInfo_Type_FromString(t)))
+ if(all || (f = MapInfo_Type_FromString(t, true, false)))
{
if((all ? MAPINFO_TYPE_ALL : f.m_flags) & pGametypeToSet.m_flags)
{
t = car(s); s = cdr(s);
bool all = t == "all";
Gametype f = NULL;
- if(all || (f = MapInfo_Type_FromString(t)))
+ if(all || (f = MapInfo_Type_FromString(t, true, false)))
{
if((all ? MAPINFO_TYPE_ALL : f.m_flags) & pGametypeToSet.m_flags)
{
{
int req = 0;
// TODO: find a better way to check if weapons are required on the map
- if(!(cvar("g_instagib") || cvar("g_overkill") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items")
+ if(!(cvar("g_instagib") || cvar("g_overkill") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") || !cvar("g_melee_only")
|| cvar("g_race") || cvar("g_cts") || cvar("g_nexball") || cvar("g_ca") || cvar("g_freezetag") || cvar("g_lms")))
req |= MAPINFO_FEATURE_WEAPONS;
return req;
Gametype MapInfo_CurrentGametype()
{
- Gametype prev = REGISTRY_GET(Gametypes, cvar("gamecfg"));
+ Gametype prev = MapInfo_Type_FromString(cvar_string("gamecfg"), false, false);
FOREACH(Gametypes, cvar(it.netname) && it != prev, return it);
return prev ? prev : MAPINFO_TYPE_DEATHMATCH;
}
void MapInfo_LoadMapSettings_SaveGameType(Gametype t)
{
MapInfo_SwitchGameType(t);
- cvar_set("gamecfg", ftos(t.m_id));
+ cvar_set("gamecfg", t.mdl);
MapInfo_LoadedGametype = t;
}
if(MapInfo_Map_supportedGametypes == 0)
{
- 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);
+ RandomSelection_Init();
+ FOREACH(Gametypes, it.m_priority == 2,
+ {
+ MapInfo_Map_supportedGametypes |= it.m_flags;
+ RandomSelection_AddEnt(it, 1, 1);
+ });
+ if(RandomSelection_chosen_ent)
+ t = RandomSelection_chosen_ent;
+ LOG_SEVEREF("Mapinfo system is not functional at all. Falling back to a preferred mode (%s).", t.mdl);
+ MapInfo_LoadMapSettings_SaveGameType(t);
+ _MapInfo_Map_ApplyGametypeEx("", t, t);
return; // do not call Get_ByName!
}
+#if 0
+ // find the lowest bit in the supported gametypes
+ // unnecessary now that we select one at random
int _t = 1;
while(!(MapInfo_Map_supportedGametypes & 1))
{
_t <<= 1;
MapInfo_Map_supportedGametypes = floor(MapInfo_Map_supportedGametypes >> 1);
}
+#endif
+ RandomSelection_Init();
Gametype t_prev = t;
- FOREACH(Gametypes, it.m_flags == _t, { t = it; break; });
+ FOREACH(Gametypes, MapInfo_Map_supportedGametypes & it.m_flags,
+ {
+ RandomSelection_AddEnt(it, 1, it.m_priority);
+ });
+ if(RandomSelection_chosen_ent)
+ t = RandomSelection_chosen_ent;
// t is now 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);
projects / xonotic / xonotic-data.pk3dir.git / blobdiff