Merge branch 'master' into terencehill/menu_weaponarena_selection_fix

[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 13d9d33e42aefb3cc43bbe65ac5ef041abe47fe8..e2258dbd4956c42e52529a862b238e249584c85e 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qc
+++ b/qcsrc/common/monsters/monster/mage.qc
@@ -68,7 +68,7 @@ float friend_needshelp(entity e)
                return false;
        if(!IS_PLAYER(e))
                return (IS_MONSTER(e) && e.health < e.max_health);
-       if(e.items & IT_INVINCIBLE)
+       if(e.items & ITEM_Shield.m_itemid)
                return false;
 
        switch(self.skin)
@@ -86,7 +86,7 @@ void mage_spike_explode()
 {
        self.event_damage = func_null;
 
-       sound(self, CH_SHOTS, "weapons/grenade_impact.wav", VOL_BASE, ATTEN_NORM);
+       sound(self, CH_SHOTS, W_Sound("grenade_impact"), VOL_BASE, ATTEN_NORM);
 
        self.realowner.mage_spike = world;
 
@@ -252,7 +252,7 @@ void mage_heal()
 
 void mage_push()
 {
-       sound(self, CH_SHOTS, "weapons/tagexp1.wav", 1, ATTEN_NORM);
+       sound(self, CH_SHOTS, W_Sound("tagexp1"), 1, ATTEN_NORM);
        RadiusDamage (self, self, (autocvar_g_monster_mage_attack_push_damage), (autocvar_g_monster_mage_attack_push_damage), (autocvar_g_monster_mage_attack_push_radius), world, world, (autocvar_g_monster_mage_attack_push_force), DEATH_MONSTER_MAGE, self.enemy);
        Send_Effect("TE_EXPLOSION", self.origin, '0 0 0', 1);
 
@@ -399,8 +399,8 @@ float m_mage(float req)
                case MR_PRECACHE:
                {
                        precache_model("models/monsters/mage.dpm");
-                       precache_sound ("weapons/grenade_impact.wav");
-                       precache_sound ("weapons/tagexp1.wav");
+                       precache_sound (W_Sound("grenade_impact"));
+                       precache_sound (W_Sound("tagexp1"));
                        return true;
                }
        }