From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 6 Dec 2011 13:16:17 +0000 (+0100)
Subject: make g_tdm_on_dm_maps also work for menu (needs clicking gametype buttons to apply)
X-Git-Tag: xonotic-v0.6.0~35^2~12^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3f0834025ea56415d16080b75ad5e45773dc6cf3;p=xonotic%2Fxonotic-data.pk3dir.git

make g_tdm_on_dm_maps also work for menu (needs clicking gametype buttons to apply)
---

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index e44e2bc7e..aad95a1fe 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1106,15 +1106,13 @@ float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametype
 {
 	float r = MapInfo_Get_ByName_NoFallbacks(pFilename, pAllowGenerate, pGametypeToSet);
 
-#ifdef SVQC
-	if(autocvar_g_tdm_on_dm_maps)
+	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);
 	}
-#endif
 
 	if(pGametypeToSet)
 	{
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 9e1bebc03..8f45f5367 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1215,4 +1215,3 @@ float autocvar_g_sandbox_object_scale_min;
 float autocvar_g_sandbox_object_scale_max;
 float autocvar_g_sandbox_object_material_velocity_min;
 float autocvar_g_sandbox_object_material_velocity_factor;
-float autocvar_g_tdm_on_dm_maps;