#include "mapinfo.qh"
#if defined(CSQC)
- #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;
+int autocvar_g_mapinfo_q3compat = 1;
#ifdef MENUQC
#define WARN_COND false
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)
+ if(autocvar_g_mapinfo_q3compat == 2) // generate mapinfo using arena data
{
// try for .arena or .defi files, as they may have more accurate information
bool isdefi = false;
+ float arena_fh = -1;
string arena_fn = _MapInfo_FindArenaFile(pFilename, ".arena");
- int arena_fh = fopen(arena_fn, FILE_READ);
+ if(arena_fn != "")
+ 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_fn != "")
+ arena_fh = fopen(arena_fn, FILE_READ);
}
if(arena_fh >= 0)
{
case "ffa": replacement = "dm"; do_warn = false; break;
case "cctf":
case "oneflag": replacement = "ctf"; do_warn = false; break;
+ case "tournament":
case "tourney": replacement = "duel"; do_warn = false; break;
case "arena": if(is_q3compat) { replacement = "ca"; do_warn = false; } break;
}
void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s, float recurse)
{
string t;
- float fh, o;
+ float o;
+ // tabs are invalid, treat them as "empty"
+ s = strreplace("\t", "", s);
+
t = car(s); s = cdr(s);
// limited support of "" and comments
{
if(recurse > 0)
{
- fh = fopen(s, FILE_READ);
+ float fh = fopen(s, FILE_READ);
if(fh < 0)
{
if(WARN_COND)
{
while((s = fgets(fh)))
{
+ s = strreplace("\t", "", s); // treat tabs as "empty", perform here first to ensure coments are detected
// catch different sorts of comments
if(s == "") // empty lines
continue;
// 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 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!)
+ bool dosave = false;
string stored_Map_description = "";
string stored_Map_title = "";
string stored_Map_author = "";
// catch different sorts of comments
if(s == "") // empty lines
continue;
- if(substring(s, 0, 1) == "#") // UNIX style
- continue;
if(substring(s, 0, 2) == "//") // C++ style
continue;
- if(substring(s, 0, 1) == "_") // q3map style
- continue;
if(strstrofs(s, "{", 0) >= 0)
{
if(in_brackets)
// if there is a valid gametype in this .arena file, include it in the menu
stored_supportedFeatures |= MAPINFO_FEATURE_WEAPONS;
// type in quake 3 holds all the supported gametypes, so we must loop through all of them
- string types = strreplace("team", "tdm ft", s); // TODO: handle support here better to include more Xonotic teamplay modes
+ // TODO: handle support here better to include more Xonotic teamplay modes
+ string types = strreplace("team", "tdm ft", s);
+ if(strstrofs(s, "tournament", 0) < 0 && strstrofs(s, "tdm", 0) >= 0) // larger team map, support additional gamemodes!
+ types = cons(types, "ca kh");
FOREACH_WORD(types, true,
{
Gametype f = MapInfo_Type_FromString(it, false, true);
#if defined(CSQC) || defined(MENUQC)
string(string filename) whichpack = #503;
#endif
+string _MapInfo_CheckArenaFile(string pFilename, string pMapname)
+{
+ // returns the file name if valid, otherwise returns ""
+ // a string is returned to optimise the use cases where a filename is also returned
+ int fh = fopen(pFilename, FILE_READ);
+ if(fh < 0)
+ return "";
+ for(string s; (s = fgets(fh)); )
+ {
+ s = strreplace("\t", "", s);
+ if(s == "")
+ continue;
+ while(substring(s, 0, 1) == " ")
+ s = substring(s, 1, -1);
+ if(substring(s, 0, 2) == "//")
+ continue;
+ int offset = strstrofs(s, "map", 0);
+ if(offset >= 0)
+ {
+ if(strstrofs(strtolower(s), strcat("\"", strtolower(pMapname), "\""), offset) >= 0) // quake 3 is case insensitive
+ {
+ fclose(fh);
+ return pFilename; // FOUND IT!
+ }
+ }
+ }
+ fclose(fh);
+ return ""; // file did not contain a "map" field matching our map name
+}
+
string _MapInfo_FindArenaFile(string pFilename, string extension)
{
string fallback = strcat("scripts/", pFilename, extension);
if(!checkextension("DP_QC_FS_SEARCH_PACKFILE"))
- return fallback;
+ return _MapInfo_CheckArenaFile(fallback, pFilename);
string base_pack = whichpack(strcat("maps/", pFilename, ".bsp"));
if(base_pack == "") // this map isn't packaged!
- return fallback;
+ return _MapInfo_CheckArenaFile(fallback, pFilename);
int glob = search_packfile_begin(strcat("scripts/*", extension), true, true, base_pack);
if(glob < 0)
- return fallback;
+ return _MapInfo_CheckArenaFile(fallback, pFilename);
int n = search_getsize(glob);
for(int j = 0; j < n; ++j)
{
string file = search_getfilename(glob, j);
-
- int fh = fopen(file, FILE_READ);
- if(fh < 0)
- continue; // how?
- for(string s; (s = fgets(fh)); )
+ if(_MapInfo_CheckArenaFile(file, pFilename) != "")
{
- int offset = strstrofs(s, "map", 0);
- if(offset >= 0)
- {
- if(strstrofs(strtolower(s), strcat("\"", strtolower(pFilename), "\""), offset) >= 0) // quake 3 is case insensitive
- {
- fclose(fh);
- search_end(glob);
- return file; // FOUND IT!
- }
- }
+ search_end(glob);
+ return file;
}
- fclose(fh);
}
search_end(glob);
- return fallback; // if we get here, a valid .arena file could not be found
+ return ""; // if we get here, a valid .arena file could not be found
}
// load info about a map by name into the MapInfo_Map_* globals
fh = fopen(fn, FILE_READ);
if(fh < 0)
{
- if(autocvar_g_mapinfo_arena_compat)
+ if(autocvar_g_mapinfo_q3compat == 1) // use arena data instead of generating a mapinfo file
{
- // try for .arena or .defi files if no .mapinfo exists
bool isdefi = false;
fn = _MapInfo_FindArenaFile(pFilename, ".arena");
- fh = fopen(fn, FILE_READ);
+ if(fn != "")
+ fh = fopen(fn, FILE_READ);
if(fh < 0)
{
isdefi = true;
fn = _MapInfo_FindArenaFile(pFilename, ".defi");
- fh = fopen(fn, FILE_READ);
+ if(fn != "")
+ fh = fopen(fn, FILE_READ);
}
if(fh >= 0)
{
fputs(fh, strcat("author ", MapInfo_Map_author, "\n"));
if(_MapInfo_Map_worldspawn_music != "")
{
- if(
- substring(_MapInfo_Map_worldspawn_music, strlen(_MapInfo_Map_worldspawn_music) - 4, 4) == ".wav"
- ||
- substring(_MapInfo_Map_worldspawn_music, strlen(_MapInfo_Map_worldspawn_music) - 4, 4) == ".ogg"
- )
- fputs(fh, strcat("cdtrack ", substring(_MapInfo_Map_worldspawn_music, 0, strlen(_MapInfo_Map_worldspawn_music) - 4), "\n"));
+ if(strcasecmp(substring(_MapInfo_Map_worldspawn_music, -4, 4), ".wav") == 0 || strcasecmp(substring(_MapInfo_Map_worldspawn_music, -4, 4), ".ogg") == 0)
+ fputs(fh, strcat("cdtrack ", substring(_MapInfo_Map_worldspawn_music, 0, -4), "\n"));
else
fputs(fh, strcat("cdtrack ", _MapInfo_Map_worldspawn_music, "\n"));
}
{
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;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff