Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/common/monsters/monster/zombie.qc b/qcsrc/common/monsters/monster/zombie.qc
index 7295578b68fb7707e6e55bad571f2903bf87ffbd..26e88b2f273fd4c7209683434365fcced69a9e56 100644 (file)
--- a/qcsrc/common/monsters/monster/zombie.qc
+++ b/qcsrc/common/monsters/monster/zombie.qc
@@ -137,7 +137,7 @@ void spawnfunc_monster_zombie()
        if(Monster_CheckAppearFlags(self))
                return;
        
-       if not(monster_initialize(MON_ZOMBIE, FALSE)) { remove(self); return; }
+       if(!monster_initialize(MON_ZOMBIE, FALSE)) { remove(self); return; }
 }
 
 float m_zombie(float req)
@@ -158,7 +158,7 @@ float m_zombie(float req)
                }
                case MR_SETUP:
                {
-                       if not(self.health) self.health = (autocvar_g_monster_zombie_health);
+                       if(!self.health) self.health = (autocvar_g_monster_zombie_health);
                        
                        if(self.spawnflags & MONSTERFLAG_NORESPAWN)
                                self.spawnflags &= ~MONSTERFLAG_NORESPAWN; // zombies always respawn