From: drjaska <drjaska83@gmail.com>
Date: Sun, 7 Mar 2021 02:59:16 +0000 (+0200)
Subject: Changed the menu order to show mayhems above unpopular modes. Included
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4e1e953ea73e40b5aaac225e5246c523fafb0296;p=xonotic%2Fxonotic-data.pk3dir.git

Changed the menu order to show mayhems above unpopular modes. Included
tdm in the force support hook so now mayhems are supported if either DM
or TDM are supported.
---

diff --git a/qcsrc/common/gamemodes/gamemode/mayhem/mayhem.qh b/qcsrc/common/gamemodes/gamemode/mayhem/mayhem.qh
index 19569ecab..6f9dd4a2f 100644
--- a/qcsrc/common/gamemodes/gamemode/mayhem/mayhem.qh
+++ b/qcsrc/common/gamemodes/gamemode/mayhem/mayhem.qh
@@ -16,6 +16,9 @@ CLASS(mayhem, Gametype)
         if(!(MapInfo_Map_supportedGametypes & this.m_flags) && (MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DEATHMATCH.m_flags)){
 	        return true;
         }
+        if(!(MapInfo_Map_supportedGametypes & this.m_flags) && (MapInfo_Map_supportedGametypes & MAPINFO_TYPE_TEAM_DEATHMATCH.m_flags)){
+	        return true;
+        }
         return false;		
     }
     ATTRIB(mayhem, m_legacydefaults, string, "30 20 0");
diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 7e0034bd4..90bc3a1bd 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -674,6 +674,8 @@ float updateCompression()
 	GAMETYPE(MAPINFO_TYPE_CTF) \
 	GAMETYPE(MAPINFO_TYPE_CA) \
 	GAMETYPE(MAPINFO_TYPE_FREEZETAG) \
+	GAMETYPE(MAPINFO_TYPE_TEAM_MAYHEM) \
+	GAMETYPE(MAPINFO_TYPE_MAYHEM) \
 	GAMETYPE(MAPINFO_TYPE_KEEPAWAY) \
 	GAMETYPE(MAPINFO_TYPE_KEYHUNT) \
 	GAMETYPE(MAPINFO_TYPE_LMS) \
@@ -681,8 +683,6 @@ float updateCompression()
 	GAMETYPE(MAPINFO_TYPE_NEXBALL) \
 	GAMETYPE(MAPINFO_TYPE_ONSLAUGHT) \
 	GAMETYPE(MAPINFO_TYPE_ASSAULT) \
-	GAMETYPE(MAPINFO_TYPE_MAYHEM) \
-	GAMETYPE(MAPINFO_TYPE_TEAM_MAYHEM) \
 	/* GAMETYPE(MAPINFO_TYPE_DUEL) */ \
 	/* GAMETYPE(MAPINFO_TYPE_INVASION) */ \
 	/**/