Replace enforcer model with e-wheel

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / monsters / monster / zombie.qc

diff --git a/qcsrc/server/monsters/monster/zombie.qc b/qcsrc/server/monsters/monster/zombie.qc
index 113ea64519c9a492ef18d36be569067bfbc43cb2..7261141b1bf0186b6890a17ed18350f73ca59257 100644 (file)
--- a/qcsrc/server/monsters/monster/zombie.qc
+++ b/qcsrc/server/monsters/monster/zombie.qc
@@ -98,10 +98,10 @@ void zombie_attack_standing()
        dot = normalize (self.enemy.origin - self.origin) * v_forward;
        if(dot > 0.3)
        {
-               Damage(self.enemy, self, self, bigdmg * monster_skill, DEATH_MONSTER_MELEE, self.origin, '0 0 0');
+               Damage(self.enemy, self, self, bigdmg * monster_skill, DEATH_MONSTER_ZOMBIE, self.origin, '0 0 0');
        }
        
-       if (!monster_isvalidtarget(self.enemy, self, FALSE))
+       if(self.enemy.health < 1)
                self.enemy = world;
                
        if (rand < 0.33)
@@ -134,7 +134,7 @@ void zombie_attack_leap_touch()
 
        angles_face = vectoangles(self.moveto - self.origin);
        angles_face = normalize(angles_face) * autocvar_g_monster_zombie_attack_leap_force;
-       Damage(other, self, self, bigdmg * monster_skill, DEATH_MONSTER_MELEE, trace_endpos, angles_face);      
+       Damage(other, self, self, bigdmg * monster_skill, DEATH_MONSTER_ZOMBIE, trace_endpos, angles_face);     
                
        self.touch = MonsterTouch;
 }
@@ -187,11 +187,7 @@ modeldisabled="models/monsters/zombie.dpm"
 */
 void spawnfunc_monster_zombie() 
 {
-       if not(autocvar_g_monster_zombie) 
-       {
-               remove(self);
-               return;
-       }
+       if not(autocvar_g_monster_zombie) { remove(self); return; }
        
        self.monster_spawnfunc = spawnfunc_monster_zombie;