Merge branch 'master' into TimePath/deathtypes

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

diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc
index 356b47dbc41bf5b815f741386d43d7a81c38a4fc..7388ee66f5bce70ddc448466967f302ce79b488c 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qc
+++ b/qcsrc/common/monsters/monster/mage.qc
@@ -23,6 +23,7 @@ REGISTER_MONSTER(MAGE, NEW(Mage)) {
 }
 
 #include "../../weapons/all.qh"
+#include "../../items/all.qc"
 
 CLASS(MageSpike, PortoLaunch)
 /* flags     */ ATTRIB(MageSpike, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);
@@ -162,6 +163,8 @@ void M_Mage_Attack_Spike_Touch()
        M_Mage_Attack_Spike_Explode();
 }
 
+.float wait;
+
 // copied from W_Seeker_Think
 void M_Mage_Attack_Spike_Think()
 {SELFPARAM();
@@ -460,6 +463,8 @@ spawnfunc(monster_mage) { Monster_Spawn(MON_MAGE.monsterid); }
                }
                #endif
                #ifdef SVQC
+               .float speed;
+               spawnfunc(item_health_large);
                METHOD(Mage, mr_setup, bool(Monster thismon))
                {
                        SELFPARAM();