Merge branch 'master' into cloudwalk9/mgburstfix

[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 d78ee5ecf6b7f4bc8f8577a5d68ca93898da3550..23de31062cae854df3882b62ee0afdd1c69b04a1 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("mage.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, '-36 -36 -24');
+    ATTRIB(Mage, m_maxs, vector, '36 36 50');
 #ifdef GAMEQC
     ATTRIB(Mage, m_model, Model, MDL_MON_MAGE);
 #endif
@@ -17,17 +17,13 @@ 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>
 
 CLASS(MageSpike, PortoLaunch)
-/* flags     */ ATTRIB(MageSpike, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);
+/* flags     */ ATTRIB(MageSpike, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_SPECIALATTACK);
 /* impulse   */ ATTRIB(MageSpike, impulse, int, 9);
 /* refname   */ ATTRIB(MageSpike, netname, string, "magespike");
 /* wepname   */ ATTRIB(MageSpike, m_name, string, _("Mage spike"));