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 e598b286c50b484b77da1ca1042516dcb977b4eb..8cebd86a35ffe60e537e8cb4f423de2a25dfe104 100644 (file)
--- 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 7f038a85fb53efe0f28d7e02a0efbd4855bce3b1..7299fca045d1c027087bad1f89e70e2a08215e4d 100644 (file)
--- 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)