Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/common/monsters/monster/mage.qh b/qcsrc/common/monsters/monster/mage.qh
index 847e5c14ca61f6d0cb44533d2989cb45e84a0b78..402e6948e2604ae4419ae2330507afd9b06705e5 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qh
+++ b/qcsrc/common/monsters/monster/mage.qh
@@ -8,8 +8,8 @@ MODEL(MON_MAGE, M_Model("nanomage.dpm"));
 
 CLASS(Mage, Monster)
     ATTRIB(Mage, spawnflags, int, MON_FLAG_MELEE | MON_FLAG_RANGED);
-    ATTRIB(Mage, mins, vector, '-36 -36 -24');
-    ATTRIB(Mage, maxs, vector, '36 36 50');
+    ATTRIB(Mage, m_mins, vector, '-16 -16 -24');
+    ATTRIB(Mage, m_maxs, vector, '16 16 55');
 #ifdef GAMEQC
     ATTRIB(Mage, m_model, Model, MDL_MON_MAGE);
 #endif
@@ -17,11 +17,7 @@ CLASS(Mage, Monster)
     ATTRIB(Mage, monster_name, string, _("Mage"));
 ENDCLASS(Mage)
 
-REGISTER_MONSTER(MAGE, NEW(Mage)) {
-#ifdef GAMEQC
-    this.mr_precache(this);
-#endif
-}
+REGISTER_MONSTER(MAGE, NEW(Mage));
 
 #include <common/weapons/_all.qh>
 #include <common/items/_mod.qh>