Merge branch 'master' into Mario/duel

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapinfo.qc

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 859ec51d54809709a8fd9a52f922902fed7ee112..8d8884f21ddd09cb06ec94da5bb3dad95884d42e 100644 (file)
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1067,6 +1067,11 @@ int MapInfo_Get_ByName(string pFilename, float pAllowGenerate, Gametype pGametyp
 {
        int r = MapInfo_Get_ByName_NoFallbacks(pFilename, pAllowGenerate, pGametypeToSet);
 
+       // force all DM maps to work in duel?!
+       // TODO: we should really check the size of maps, some DM maps do not work for duel!
+       if(!(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DUEL.m_flags) && (MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DEATHMATCH.m_flags))
+               _MapInfo_Map_ApplyGametypeEx ("", pGametypeToSet, MAPINFO_TYPE_DUEL);
+
        if(cvar("g_tdm_on_dm_maps"))
        {
                // if this is set, all DM maps support TDM too