X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=1b32c9d1d5a076c3825f5ea9900522282f7abd40;hb=c6c371883dde697e1f237d498c08e09788b6af6b;hp=4ec54b0f06ace8cd5773fa846296ccda602b23ca;hpb=2976326817cdd461dcfa0fdbcb58d3413687451b;p=xonotic%2Fxonotic-data.pk3dir.git
diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 4ec54b0f0..1b32c9d1d 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -78,6 +78,7 @@ float MapInfo_Cache_Retrieve(string map)
MapInfo_Map_supportedGametypes = stof(bufstr_get(_MapInfo_Cache_Buf_IndexToMapData, ++i));
MapInfo_Map_supportedFeatures = stof(bufstr_get(_MapInfo_Cache_Buf_IndexToMapData, ++i));
MapInfo_Map_flags = stof(bufstr_get(_MapInfo_Cache_Buf_IndexToMapData, ++i));
+
return 1;
}
@@ -471,8 +472,7 @@ void _MapInfo_Map_ApplyGametype(string s, float pWantedType, float pThisType, fl
{
sa = car(s);
if(sa != "")
- if(cvar("g_ctf_win_mode") < 2)
- cvar_set("fraglimit", sa);
+ cvar_set("fraglimit", sa);
s = cdr(s);
}
@@ -534,26 +534,11 @@ void _MapInfo_Map_ApplyGametype(string s, float pWantedType, float pThisType, fl
string _MapInfo_GetDefaultEx(float t)
{
- switch(t)
- {
- case MAPINFO_TYPE_DEATHMATCH: return "timelimit=20 pointlimit=30 leadlimit=0";
- case MAPINFO_TYPE_TEAM_DEATHMATCH: return "timelimit=20 pointlimit=50 teams=2 leadlimit=0";
- case MAPINFO_TYPE_DOMINATION: return "timelimit=20 pointlimit=200 teams=2 leadlimit=0";
- case MAPINFO_TYPE_CTF: return "timelimit=20 pointlimit=300 caplimit=10 leadlimit=0";
- case MAPINFO_TYPE_RUNEMATCH: return "timelimit=20 pointlimit=200 leadlimit=0";
- case MAPINFO_TYPE_LMS: return "timelimit=20 lives=9 leadlimit=0";
- case MAPINFO_TYPE_ARENA: return "timelimit=20 pointlimit=10 leadlimit=0";
- case MAPINFO_TYPE_CA: return "timelimit=20 pointlimit=10 leadlimit=0";
- case MAPINFO_TYPE_KEYHUNT: return "timelimit=20 pointlimit=1000 teams=3 leadlimit=0";
- case MAPINFO_TYPE_ASSAULT: return "timelimit=20";
- case MAPINFO_TYPE_RACE: return "timelimit=20 qualifying_timelimit=5 laplimit=7 teamlaplimit=15 leadlimit=0";
- case MAPINFO_TYPE_ONSLAUGHT: return "timelimit=20";
- case MAPINFO_TYPE_NEXBALL: return "timelimit=20 pointlimit=5 leadlimit=0";
- case MAPINFO_TYPE_CTS: return "timelimit=20 skill=-1";
- case MAPINFO_TYPE_FREEZETAG: return "timelimit=20 pointlimit=10 teams=2 leadlimit=0";
- case MAPINFO_TYPE_KEEPAWAY: return "timelimit=20 pointlimit=30";
- default: return "";
- }
+ entity e;
+ for(e = MapInfo_Type_first; e; e = e.enemy)
+ if(t == e.weapons)
+ return e.model2;
+ return "";
}
void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
@@ -561,7 +546,6 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
string sa, k, v;
float p;
string fraglimit_normal;
- string fraglimit_caps;
string fraglimit_teams;
MapInfo_Map_supportedGametypes |= pThisType;
@@ -579,7 +563,6 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
cvar_set("g_race_qualifying_timelimit", cvar_defstring("g_race_qualifying_timelimit"));
fraglimit_normal = string_null;
- fraglimit_caps = string_null;
fraglimit_teams = string_null;
s = strcat(_MapInfo_GetDefaultEx(pWantedType), " ", s);
@@ -611,14 +594,10 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
{
cvar_set("leadlimit", v);
}
- else if(k == "pointlimit" || k == "fraglimit" || k == "lives" || k == "laplimit")
+ else if(k == "pointlimit" || k == "fraglimit" || k == "lives" || k == "laplimit" || k == "caplimit")
{
fraglimit_normal = v;
}
- else if(k == "caplimit")
- {
- fraglimit_caps = v;
- }
else if(k == "teampointlimit" || k == "teamlaplimit")
{
fraglimit_teams = v;
@@ -643,12 +622,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
}
}
- if(pWantedType == MAPINFO_TYPE_CTF && cvar("g_ctf_win_mode") < 2)
- {
- if(fraglimit_caps)
- cvar_set("fraglimit", fraglimit_caps);
- }
- else 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);
@@ -662,46 +636,33 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
float MapInfo_Type_FromString(string t)
{
- if (t == "dm") return MAPINFO_TYPE_DEATHMATCH;
- else if(t == "tdm") return MAPINFO_TYPE_TEAM_DEATHMATCH;
- else if(t == "dom") return MAPINFO_TYPE_DOMINATION;
- else if(t == "ctf") return MAPINFO_TYPE_CTF;
- else if(t == "rune") return MAPINFO_TYPE_RUNEMATCH;
- else if(t == "lms") return MAPINFO_TYPE_LMS;
- else if(t == "arena") return MAPINFO_TYPE_ARENA;
- else if(t == "ca") return MAPINFO_TYPE_CA;
- else if(t == "kh") return MAPINFO_TYPE_KEYHUNT;
- else if(t == "as") return MAPINFO_TYPE_ASSAULT;
- else if(t == "ons") return MAPINFO_TYPE_ONSLAUGHT;
- else if(t == "rc") return MAPINFO_TYPE_RACE;
- else if(t == "nexball") return MAPINFO_TYPE_NEXBALL;
- else if(t == "cts") return MAPINFO_TYPE_CTS;
- else if(t == "freezetag") return MAPINFO_TYPE_FREEZETAG;
- else if(t == "keepaway") return MAPINFO_TYPE_KEEPAWAY;
- else if(t == "all") return MAPINFO_TYPE_ALL;
- else return 0;
+ entity e;
+ if(t == "all")
+ return MAPINFO_TYPE_ALL;
+ for(e = MapInfo_Type_first; e; e = e.enemy)
+ if(t == e.mdl)
+ return e.weapons;
+ return 0;
}
string MapInfo_Type_ToString(float t)
{
- if (t == MAPINFO_TYPE_DEATHMATCH) return "dm";
- else if(t == MAPINFO_TYPE_TEAM_DEATHMATCH) return "tdm";
- else if(t == MAPINFO_TYPE_DOMINATION) return "dom";
- else if(t == MAPINFO_TYPE_CTF) return "ctf";
- else if(t == MAPINFO_TYPE_RUNEMATCH) return "rune";
- else if(t == MAPINFO_TYPE_LMS) return "lms";
- else if(t == MAPINFO_TYPE_ARENA) return "arena";
- else if(t == MAPINFO_TYPE_CA) return "ca";
- else if(t == MAPINFO_TYPE_KEYHUNT) return "kh";
- else if(t == MAPINFO_TYPE_ASSAULT) return "as";
- else if(t == MAPINFO_TYPE_ONSLAUGHT) return "ons";
- else if(t == MAPINFO_TYPE_RACE) return "rc";
- else if(t == MAPINFO_TYPE_NEXBALL) return "nexball";
- else if(t == MAPINFO_TYPE_CTS) return "cts";
- else if(t == MAPINFO_TYPE_FREEZETAG) return "freezetag";
- else if(t == MAPINFO_TYPE_KEEPAWAY) return "keepaway";
- else if(t == MAPINFO_TYPE_ALL) return "all";
- else return "";
+ entity e;
+ if(t == MAPINFO_TYPE_ALL)
+ return "all";
+ for(e = MapInfo_Type_first; e; e = e.enemy)
+ if(t == e.weapons)
+ return e.mdl;
+ return "";
+}
+
+string MapInfo_Type_ToText(float t)
+{
+ entity e;
+ for(e = MapInfo_Type_first; e; e = e.enemy)
+ if(t == e.weapons)
+ return e.message;
+ return _("@!#%'n Tuba Throwing");
}
void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s, float recurse)
@@ -830,7 +791,7 @@ float MapInfo_isRedundant(string fn, string t)
}
// load info about a map by name into the MapInfo_Map_* globals
-float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametypeToSet)
+float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, float pGametypeToSet)
{
string fn;
string s, t;
@@ -1088,16 +1049,6 @@ float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametype
}
fclose(fh);
- if(pGametypeToSet)
- {
- if(!(MapInfo_Map_supportedGametypes & pGametypeToSet))
- {
- 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;
- }
- }
-
if(MapInfo_Map_title == "
")
MapInfo_Map_titlestring = MapInfo_Map_bspname;
else if(MapInfo_isRedundant(MapInfo_Map_bspname, MapInfo_Map_title))
@@ -1111,6 +1062,30 @@ float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametype
dprint("Map ", pFilename, " supports no game types, ignored\n");
return 0;
}
+float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametypeToSet)
+{
+ float 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 not(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_TEAM_DEATHMATCH)
+ if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DEATHMATCH)
+ _MapInfo_Map_ApplyGametypeEx ("", pGametypeToSet, MAPINFO_TYPE_TEAM_DEATHMATCH);
+ }
+
+ if(pGametypeToSet)
+ {
+ if(!(MapInfo_Map_supportedGametypes & pGametypeToSet))
+ {
+ 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;
+ }
+ }
+
+ return r;
+}
float MapInfo_FindName(string s)
{
@@ -1177,38 +1152,16 @@ float MapInfo_CurrentFeatures()
float MapInfo_CurrentGametype()
{
- if(cvar("g_domination"))
- return MAPINFO_TYPE_DOMINATION;
- else if(cvar("g_ctf"))
- return MAPINFO_TYPE_CTF;
- else if(cvar("g_runematch"))
- return MAPINFO_TYPE_RUNEMATCH;
- else if(cvar("g_tdm"))
- return MAPINFO_TYPE_TEAM_DEATHMATCH;
- else if(cvar("g_assault"))
- return MAPINFO_TYPE_ASSAULT;
- else if(cvar("g_lms"))
- return MAPINFO_TYPE_LMS;
- else if(cvar("g_arena"))
- return MAPINFO_TYPE_ARENA;
- else if(cvar("g_ca"))
- return MAPINFO_TYPE_CA;
- else if(cvar("g_keyhunt"))
- return MAPINFO_TYPE_KEYHUNT;
- else if(cvar("g_onslaught"))
- return MAPINFO_TYPE_ONSLAUGHT;
- else if(cvar("g_race"))
- return MAPINFO_TYPE_RACE;
- else if(cvar("g_nexball"))
- return MAPINFO_TYPE_NEXBALL;
- else if(cvar("g_cts"))
- return MAPINFO_TYPE_CTS;
- else if(cvar("g_freezetag"))
- return MAPINFO_TYPE_FREEZETAG;
- else if(cvar("g_keepaway"))
- return MAPINFO_TYPE_KEEPAWAY;
- else
- return MAPINFO_TYPE_DEATHMATCH;
+ float prev;
+ entity e;
+ prev = cvar("gamecfg");
+ for(e = MapInfo_Type_first; e; e = e.enemy)
+ if(cvar(e.netname))
+ if(prev != e.weapons)
+ return e.weapons;
+ if(prev)
+ return prev;
+ return MAPINFO_TYPE_DEATHMATCH;
}
float _MapInfo_CheckMap(string s) // returns 0 if the map can't be played with the current settings, 1 otherwise
@@ -1230,52 +1183,14 @@ float MapInfo_CheckMap(string s) // returns 0 if the map can't be played with th
return r;
}
-string MapInfo_GetGameTypeCvar(float t)
-{
- switch(t)
- {
- case MAPINFO_TYPE_DEATHMATCH: return "g_dm";
- case MAPINFO_TYPE_TEAM_DEATHMATCH: return "g_tdm";
- case MAPINFO_TYPE_DOMINATION: return "g_domination";
- case MAPINFO_TYPE_CTF: return "g_ctf";
- case MAPINFO_TYPE_RUNEMATCH: return "g_runematch";
- case MAPINFO_TYPE_LMS: return "g_lms";
- case MAPINFO_TYPE_ARENA: return "g_arena";
- case MAPINFO_TYPE_CA: return "g_ca";
- case MAPINFO_TYPE_KEYHUNT: return "g_kh";
- case MAPINFO_TYPE_ASSAULT: return "g_assault";
- case MAPINFO_TYPE_ONSLAUGHT: return "g_onslaught";
- case MAPINFO_TYPE_RACE: return "g_race";
- case MAPINFO_TYPE_NEXBALL: return "g_nexball";
- case MAPINFO_TYPE_FREEZETAG: return "g_freezetag";
- case MAPINFO_TYPE_CTS: return "g_cts";
- case MAPINFO_TYPE_KEEPAWAY: return "g_keepaway";
- default: return "";
- }
-}
-
void MapInfo_SwitchGameType(float t)
{
- cvar_set("gamecfg", "0");
- cvar_set("g_dm", (t == MAPINFO_TYPE_DEATHMATCH) ? "1" : "0");
- cvar_set("g_tdm", (t == MAPINFO_TYPE_TEAM_DEATHMATCH) ? "1" : "0");
- cvar_set("g_domination", (t == MAPINFO_TYPE_DOMINATION) ? "1" : "0");
- cvar_set("g_ctf", (t == MAPINFO_TYPE_CTF) ? "1" : "0");
- cvar_set("g_runematch", (t == MAPINFO_TYPE_RUNEMATCH) ? "1" : "0");
- cvar_set("g_lms", (t == MAPINFO_TYPE_LMS) ? "1" : "0");
- cvar_set("g_arena", (t == MAPINFO_TYPE_ARENA) ? "1" : "0");
- cvar_set("g_ca", (t == MAPINFO_TYPE_CA) ? "1" : "0");
- cvar_set("g_keyhunt", (t == MAPINFO_TYPE_KEYHUNT) ? "1" : "0");
- cvar_set("g_assault", (t == MAPINFO_TYPE_ASSAULT) ? "1" : "0");
- cvar_set("g_onslaught", (t == MAPINFO_TYPE_ONSLAUGHT) ? "1" : "0");
- cvar_set("g_race", (t == MAPINFO_TYPE_RACE) ? "1" : "0");
- cvar_set("g_nexball", (t == MAPINFO_TYPE_NEXBALL) ? "1" : "0");
- cvar_set("g_cts", (t == MAPINFO_TYPE_CTS) ? "1" : "0");
- cvar_set("g_freezetag", (t == MAPINFO_TYPE_FREEZETAG) ? "1" : "0");
- cvar_set("g_keepaway", (t == MAPINFO_TYPE_KEEPAWAY) ? "1" : "0");
+ entity e;
+ for(e = MapInfo_Type_first; e; e = e.enemy)
+ cvar_set(e.netname, (t == e.weapons) ? "1" : "0");
}
-void MapInfo_LoadMap(string s)
+void MapInfo_LoadMap(string s, float reinit)
{
MapInfo_Map_supportedGametypes = 0;
// we shouldn't need this, as LoadMapSettings already fixes the gametype
@@ -1284,7 +1199,12 @@ void MapInfo_LoadMap(string s)
// print("EMERGENCY: can't play the selected map in the given game mode. Falling back to DM.\n");
// MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH);
//}
- localcmd(strcat("\nsettemp_restore\nchangelevel ", s, "\n"));
+
+ cvar_settemp_restore();
+ if(reinit)
+ localcmd(strcat("\nmap ", s, "\n"));
+ else
+ localcmd(strcat("\nchangelevel ", s, "\n"));
}
string MapInfo_ListAllowedMaps(float pRequiredFlags, float pForbiddenFlags)
@@ -1320,16 +1240,35 @@ string MapInfo_ListAllAllowedMaps(float pRequiredFlags, float pForbiddenFlags)
return substring(out, 1, strlen(out) - 1);
}
+void MapInfo_LoadMapSettings_SaveGameType(float t)
+{
+ MapInfo_SwitchGameType(t);
+ cvar_set("gamecfg", ftos(t));
+ MapInfo_LoadedGametype = t;
+}
+
void MapInfo_LoadMapSettings(string s) // to be called from worldspawn
{
- float t, t0;
+ float t;
+
+ t = MapInfo_CurrentGametype();
+ MapInfo_LoadMapSettings_SaveGameType(t);
+
if(!_MapInfo_CheckMap(s)) // 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");
+ _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;
- _MapInfo_Map_ApplyGametypeEx("", t0, t0);
+ MapInfo_LoadMapSettings_SaveGameType(MAPINFO_TYPE_DEATHMATCH);
+ _MapInfo_Map_ApplyGametypeEx("", MAPINFO_TYPE_DEATHMATCH, MAPINFO_TYPE_DEATHMATCH);
return; // do not call Get_ByName!
}
@@ -1339,23 +1278,12 @@ void MapInfo_LoadMapSettings(string s) // to be called from worldspawn
t *= 2;
MapInfo_Map_supportedGametypes = floor(MapInfo_Map_supportedGametypes / 2);
}
+
// t is now a supported mode!
- t0 = MapInfo_CurrentGametype();
- 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");
- cvar_settemp_restore();
- _MapInfo_Map_ApplyGametypeEx("", t0, t0);
- return; // do not call Get_ByName!
- }
- else
- {
- print("EMERGENCY: can't play the selected map in the given game mode. Falling back to a supported mode.\n");
- MapInfo_SwitchGameType(t);
- }
+ print("EMERGENCY: can't play the selected map in the given game mode. Falling back to a supported mode.\n");
+ MapInfo_LoadMapSettings_SaveGameType(t);
}
- cvar_settemp_restore();
- MapInfo_Get_ByName(s, 1, MapInfo_CurrentGametype());
+ MapInfo_Get_ByName(s, 1, t);
}
void MapInfo_ClearTemps()