From f811e82aeffc823c1e1de561bccad58ae4fc3fc8 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 30 Jul 2017 08:47:24 +1000 Subject: [PATCH] Fix golem hitbox and make invasion a hidden gamemode in the menu --- qcsrc/common/monsters/monster/golem.qh | 4 ++-- qcsrc/menu/xonotic/util.qc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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) -- 2.39.2