Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / monster / golem.qh

diff --git a/qcsrc/common/monsters/monster/golem.qh b/qcsrc/common/monsters/monster/golem.qh
index a60c6daeacaaa3c6c1fa423f6a34764c863a48d6..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, '-41 -41 -20');
-    ATTRIB(Golem, maxs, vector, '41 41 65');
+    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
@@ -17,8 +17,4 @@ CLASS(Golem, Monster)
     ATTRIB(Golem, monster_name, string, _("Golem"));
 ENDCLASS(Golem)
 
-REGISTER_MONSTER(GOLEM, NEW(Golem)) {
-#ifdef GAMEQC
-    this.mr_precache(this);
-#endif
-}
+REGISTER_MONSTER(GOLEM, NEW(Golem));