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 e44e2bc7efcdaf689b73c1c5cc1bbca084043eec..aad95a1fe5421c38ae4169ae282bb8c42978e079 100644 (file)
--- 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 9e1bebc03775aff2fecc71485fcdb63957f2a2ca..8f45f5367e2ae88756d0fef15a65ea961cb5ab87 100644 (file)
--- 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;