int autocvar_g_mapinfo_q3compat = 1;
-#ifdef MENUQC
-#define WARN_COND false
+#ifdef SVQC
+ bool autocvar_g_mapinfo_ignore_warnings;
+ #define WARN_COND (!autocvar_g_mapinfo_ignore_warnings && MapInfo_Map_bspname == mi_shortname)
#else
-bool autocvar_g_mapinfo_ignore_warnings;
-#define WARN_COND (!autocvar_g_mapinfo_ignore_warnings && MapInfo_Map_bspname == mi_shortname)
+ #define WARN_COND false
#endif
// generic string stuff
float diameter, spawnpoints;
float spawnplaces;
bool is_q3df_map = false;
-
vector mapMins, mapMaxs;
+ if(autocvar_g_mapinfo_q3compat >= 2) // generate mapinfo using arena data
+ {
+ // try for .arena or .defi files, as they may have more accurate information
+ // supporting .arena AND .defi for the same map
+ bool success = false;
+ fh = -1;
+ fn = _MapInfo_FindArenaFile(pFilename, ".arena");
+ if(fn != "" && (fh = fopen(fn, FILE_READ)) >= 0)
+ {
+ success = _MapInfo_ParseArena(fn, fh, pFilename, NULL, false, true);
+ fclose(fh);
+ }
+ fn = _MapInfo_FindArenaFile(pFilename, ".defi");
+ if(fn != "" && (fh = fopen(fn, FILE_READ)) >= 0)
+ {
+ success |= _MapInfo_ParseArena(fn, fh, pFilename, NULL, true, true);
+ fclose(fh);
+ }
+ if (success && autocvar_g_mapinfo_q3compat == 3)
+ return 3; // skip entity analysis
+ }
+
r = 1;
fn = strcat("maps/", pFilename, ".ent");
fh = fopen(fn, FILE_READ);
}
if(fh < 0)
return 0;
- LOG_INFO("Analyzing ", fn, " to generate initial mapinfo");
+ LOG_INFO("Generating ", pFilename, ".mapinfo: analyzing ", fn);
inWorldspawn = 2;
- MapInfo_Map_flags = 0;
- MapInfo_Map_supportedGametypes = 0;
spawnpoints = 0;
spawnplaces = 0;
_MapInfo_Map_worldspawn_music = "";
mapMins = '0 0 0';
mapMaxs = '0 0 0';
- 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");
- if(arena_fn != "")
- arena_fh = fopen(arena_fn, FILE_READ);
- if(arena_fh < 0)
- {
- isdefi = true;
- arena_fn = _MapInfo_FindArenaFile(pFilename, ".defi");
- if(arena_fn != "")
- 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))))
_MapInfo_Map_worldspawn_music = v;
else if(k == "noise")
_MapInfo_Map_worldspawn_music = v;
- else if(k == "message" && (!MapInfo_Map_title || MapInfo_Map_title == "<TITLE>"))
- {
- i = strstrofs(v, " by ", 0);
- if(MapInfo_Map_author == "<AUTHOR>" && i >= 0)
- {
- MapInfo_Map_title = substring(v, 0, i);
- MapInfo_Map_author = substring(v, i + 4, strlen(v) - (i + 4));
- }
- else
- MapInfo_Map_title = v;
- }
+ else if(k == "message" && (!MapInfo_Map_title || MapInfo_Map_title == "<TITLE>") && v != "")
+ MapInfo_Map_title = v;
}
else
{
else if(v == "target_music" || v == "trigger_music")
_MapInfo_Map_worldspawn_music = string_null; // don't use regular BGM
else if(v == "target_stopTimer")
- is_q3df_map = true; // don't support standard gamemodes
+ is_q3df_map = true; // don't support standard gametypes UNLESS we found them in .arena
else
FOREACH(Gametypes, true, it.m_generate_mapinfo(it, v));
}
Gametype MapInfo_Type_FromString(string gtype, bool dowarn, bool is_q3compat)
{
string replacement = "";
- bool do_warn = true;
+
switch (gtype)
{
case "nexball": replacement = "nb"; break;
case "invasion": replacement = "inv"; break;
case "assault": replacement = "as"; break;
case "race": replacement = "rc"; break;
- // quake 3 compat
- 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;
+ // Q3/QL compat, see DoesQ3ARemoveThisEntity() in quake3.qc for complete lists
+ case "ffa": replacement = "dm"; break;
+ case "cctf": // from ThreeWave, maps with this should all have "ctf" too
+ case "oneflag": replacement = "ctf"; break;
+ case "tourney": replacement = "duel"; break;
+ case "arena": // which Q3 mod is this from? In Nexuiz it was 'duel with rounds'.
+ if(is_q3compat) { replacement = "ca"; } break;
}
if (replacement != "")
{
}
}
-float MapInfo_isRedundant(string fn, string t)
+/// Removes author string from title (if found)
+/// and copies it to MapInfo_Map_author if that wasn't set.
+string MapInfo_title_sans_author(string title)
+{
+ int offset;
+
+ if ((offset = strstrofs(title, " by ", 0)) >= 0)
+ {
+ if (MapInfo_Map_author == "<AUTHOR>")
+ MapInfo_Map_author = substring(title, offset + 4, strlen(title) - (offset + 4));
+ title = substring(title, 0, offset);
+ }
+
+ return title != "" ? title : "<TITLE>";
+}
+
+bool MapInfo_isRedundant(string fn, string t)
{
// normalize file name
fn = strreplace("_", "", fn);
int stored_supportedFeatures = 0;
int stored_flags = 0;
string t, s;
+
+ if (isgenerator)
+ LOG_INFO("Generating ", pFilename, ".mapinfo: analyzing ", arena_filename);
+
for (;;)
{
if (!((s = fgets(fh))))
if(stored_Map_title != "")
MapInfo_Map_title = stored_Map_title;
MapInfo_Map_author = stored_Map_author;
+ // might have .arena AND .defi for the same map so these bitfields are OR'd
if(isgenerator)
- MapInfo_Map_supportedGametypes = stored_supportedGametypes;
+ MapInfo_Map_supportedGametypes |= stored_supportedGametypes;
else
{
FOREACH(Gametypes, it.m_flags & stored_supportedGametypes,
_MapInfo_Map_ApplyGametype ("", pGametypeToSet, it, true);
});
}
- MapInfo_Map_supportedFeatures = stored_supportedFeatures;
- MapInfo_Map_flags = stored_flags;
+ MapInfo_Map_supportedFeatures |= stored_supportedFeatures;
+ MapInfo_Map_flags |= stored_flags;
return true; // no need to continue through the file, we have our map!
}
else
string types = s;
types = strreplace("team", "tdm ft", types);
types = strreplace("ffa", "dm lms ka", types);
- if(strstrofs(types, "tournament", 0) < 0 && strstrofs(types, "tdm", 0) >= 0) // larger team map, support additional gamemodes!
+ types = strreplace("tourney", "duel", types); // QL used duel so the following check must support it
+ if(strstrofs(types, "duel", 0) < 0 && strstrofs(types, "tdm", 0) >= 0) // larger team map, support additional gamemodes!
types = cons(types, "ca kh");
FOREACH_WORD(types, true,
{
return false;
}
-#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 ""
fh = fopen(fn, FILE_READ);
if(fh < 0)
{
- if(autocvar_g_mapinfo_q3compat) // use arena data instead of generating a mapinfo file
+ if(autocvar_g_mapinfo_q3compat == 1) // use arena data instead of generating a mapinfo file
{
- bool isdefi = false;
- if(autocvar_g_mapinfo_q3compat == 1) // only parse .arena files in mode 1
- {
- fn = _MapInfo_FindArenaFile(pFilename, ".arena");
- if(fn != "")
- fh = fopen(fn, FILE_READ);
- }
- if(fh < 0 || autocvar_g_mapinfo_q3compat == 2)
+ // supporting .arena AND .defi for the same map
+ bool success = false;
+ fn = _MapInfo_FindArenaFile(pFilename, ".arena");
+ if(fn != "" && (fh = fopen(fn, FILE_READ)) >= 0)
{
- isdefi = true;
- fn = _MapInfo_FindArenaFile(pFilename, ".defi");
- if(fn != "")
- fh = fopen(fn, FILE_READ);
+ _MapInfo_Map_Reset();
+ success = _MapInfo_ParseArena(fn, fh, pFilename, pGametypeToSet, false, false);
+ fclose(fh);
}
- if(fh >= 0)
+ fn = _MapInfo_FindArenaFile(pFilename, ".defi");
+ if(fn != "" && (fh = fopen(fn, FILE_READ)) >= 0)
{
- _MapInfo_Map_Reset();
- if(_MapInfo_ParseArena(fn, fh, pFilename, pGametypeToSet, isdefi, false))
- goto mapinfo_handled; // skip generation
+ if(!success)
+ _MapInfo_Map_Reset();
+ success |= _MapInfo_ParseArena(fn, fh, pFilename, pGametypeToSet, true, false);
+ fclose(fh);
}
+ if(success)
+ goto mapinfo_handled; // skip generation
}
fn = strcat("maps/autogenerated/", pFilename, ".mapinfo");
r = _MapInfo_Generate(pFilename);
if(!r)
return 0;
+ MapInfo_Map_title = MapInfo_title_sans_author(MapInfo_Map_title);
fh = fopen(fn, FILE_WRITE);
fputs(fh, strcat("title ", MapInfo_Map_title, "\n"));
fputs(fh, strcat("description ", MapInfo_Map_description, "\n"));
{
MapInfo_Map_flags |= MAPINFO_FLAG_FRUSTRATING;
}
- else if(t == "noautomaplist")
+ else if(t == "donotwant" || t == "noautomaplist")
{
- MapInfo_Map_flags |= MAPINFO_FLAG_NOAUTOMAPLIST;
+ MapInfo_Map_flags |= MAPINFO_FLAG_DONOTWANT;
}
else if(t == "gameversion_min")
{
if (cvar("gameversion") < stof(s))
- MapInfo_Map_flags |= MAPINFO_FLAG_NOAUTOMAPLIST;
+ MapInfo_Map_flags |= MAPINFO_FLAG_DONOTWANT;
}
else if(t == "type")
{
else if(WARN_COND)
LOG_WARN("Map ", pFilename, " provides unknown info item ", t, ", ignored");
}
- LABEL(mapinfo_handled)
fclose(fh);
+LABEL(mapinfo_handled)
+#ifdef SVQC
+ // if the map is currently loaded we can read worldspawn fields directly
+ if (pFilename == mi_shortname)
+ {
+ if (MapInfo_Map_title == "<TITLE>")
+ if (world.message != "")
+ MapInfo_Map_title = world.message;
+ }
+#endif
+ // Could skip removing author from title when it's source is .mapinfo
+ // but must always do it for world.message and .arena/.defi as VQ3 didn't support author
+ // so mappers tended to put it in world.message and/or longname.
+ MapInfo_Map_title = MapInfo_title_sans_author(MapInfo_Map_title); // may set author if not set
+
if(MapInfo_Map_title == "<TITLE>")
- MapInfo_Map_titlestring = MapInfo_Map_bspname;
+ MapInfo_Map_titlestring = strcat("^2", MapInfo_Map_bspname);
else if(MapInfo_isRedundant(MapInfo_Map_bspname, MapInfo_Map_title))
- MapInfo_Map_titlestring = MapInfo_Map_title;
+ MapInfo_Map_titlestring = strcat("^2", MapInfo_Map_title);
else
- MapInfo_Map_titlestring = sprintf("%s: %s", MapInfo_Map_bspname, MapInfo_Map_title);
+ MapInfo_Map_titlestring = sprintf("^2%s ^7// ^2%s", MapInfo_Map_bspname, MapInfo_Map_title);
MapInfo_Cache_Store();
if(MapInfo_Map_supportedGametypes != 0)
projects / xonotic / xonotic-data.pk3dir.git / blobdiff