Merge branch 'master' into Mario/monsters

[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 83b07974958c70ebd195af1caec75cf7c059b578..c6e1b18981f17a02eb47b2ead84d3c5a930571cc 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qc
+++ b/qcsrc/common/monsters/monster/mage.qc
@@ -305,7 +305,7 @@ float mage_attack(float attack_type)
                }
                case MONSTER_ATTACK_RANGED:
                {
-                       if not(self.mage_spike)
+                       if(!self.mage_spike)
                        {
                                if(random() <= 0.4)
                                {
@@ -340,7 +340,7 @@ void spawnfunc_monster_mage()
        if(Monster_CheckAppearFlags(self))
                return;
        
-       if not(monster_initialize(MON_MAGE, FALSE)) { remove(self); return; }
+       if(!monster_initialize(MON_MAGE, FALSE)) { remove(self); return; }
 }
 
 // compatibility with old spawns
@@ -387,7 +387,7 @@ float m_mage(float req)
                }
                case MR_SETUP:
                {
-                       if not(self.health) self.health = (autocvar_g_monster_mage_health);
+                       if(!self.health) self.health = (autocvar_g_monster_mage_health);
                        
                        self.monster_loot = spawnfunc_item_health_large;
                        self.monster_attackfunc = mage_attack;