From: Mario <mario@smbclan.net>
Date: Sat, 29 Jul 2017 22:47:24 +0000 (+1000)
Subject: Fix golem hitbox and make invasion a hidden gamemode in the menu
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~77
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f811e82aeffc823c1e1de561bccad58ae4fc3fc8;p=xonotic%2Fxonotic-data.pk3dir.git

Fix golem hitbox and make invasion a hidden gamemode in the menu
---

diff --git a/qcsrc/common/monsters/monster/golem.qh b/qcsrc/common/monsters/monster/golem.qh
index e598b286c5..8cebd86a35 100644
--- a/qcsrc/common/monsters/monster/golem.qh
+++ b/qcsrc/common/monsters/monster/golem.qh
@@ -8,8 +8,8 @@ MODEL(MON_GOLEM, M_Model("golem.dpm"));
 
 CLASS(Golem, Monster)
     ATTRIB(Golem, spawnflags, int, MON_FLAG_SUPERMONSTER | MON_FLAG_MELEE | MON_FLAG_RANGED);
-    ATTRIB(Golem, mins, vector, '-24 -24 -20');
-    ATTRIB(Golem, maxs, vector, '24 24 88');
+    ATTRIB(Golem, m_mins, vector, '-24 -24 -20');
+    ATTRIB(Golem, m_maxs, vector, '24 24 88');
 #ifdef GAMEQC
     ATTRIB(Golem, m_model, Model, MDL_MON_GOLEM);
 #endif
diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 7f038a85fb..7299fca045 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -693,13 +693,13 @@ float updateCompression()
 	GAMETYPE(MAPINFO_TYPE_NEXBALL) \
 	GAMETYPE(MAPINFO_TYPE_ONSLAUGHT) \
 	GAMETYPE(MAPINFO_TYPE_ASSAULT) \
-	/* GAMETYPE(MAPINFO_TYPE_INVASION) */ \
 	/**/
 
 // hidden gametypes come last so indexing always works correctly
 #define HIDDEN_GAMETYPES \
 	GAMETYPE(MAPINFO_TYPE_RACE) \
 	GAMETYPE(MAPINFO_TYPE_CTS) \
+	GAMETYPE(MAPINFO_TYPE_INVASION) \
 	/**/
 
 Gametype GameType_GetID(int cnt)