Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / gamemode_invasion.qc

diff --git a/qcsrc/server/mutators/gamemode_invasion.qc b/qcsrc/server/mutators/gamemode_invasion.qc
index 4e339f7c9ac91059a4ce4f4cf97ee70545fcc5d9..de8b13e44b3ebbf4ad23caf7214a11b9f1da0d5e 100644 (file)
--- a/qcsrc/server/mutators/gamemode_invasion.qc
+++ b/qcsrc/server/mutators/gamemode_invasion.qc
@@ -1,6 +1,6 @@
 void invasion_spawnpoint()
 {
-       if not(g_invasion) { remove(self); return; }
+       if(!g_invasion) { remove(self); return; }
        
        self.classname = "invasion_spawnpoint";
 }
@@ -183,7 +183,7 @@ void Invasion_RoundStart()
 
 MUTATOR_HOOKFUNCTION(invasion_MonsterDies)
 {
-       if not(self.monster_respawned)
+       if(!self.monster_respawned)
        {
                numkilled += 1;
                maxcurrent -= 1;
@@ -197,7 +197,7 @@ MUTATOR_HOOKFUNCTION(invasion_MonsterDies)
 
 MUTATOR_HOOKFUNCTION(invasion_MonsterSpawn)
 {
-       if not(self.spawnflags & MONSTERFLAG_SPAWNED)
+       if(!(self.spawnflags & MONSTERFLAG_SPAWNED))
        {
                monster_remove(self);
                return FALSE;
@@ -206,7 +206,7 @@ MUTATOR_HOOKFUNCTION(invasion_MonsterSpawn)
        if(roundcnt < maxrounds && self.spawnflags & MONSTERFLAG_MINIBOSS)
                self.spawnflags &= ~MONSTERFLAG_MINIBOSS;
        
-       if not(self.monster_respawned)
+       if(!self.monster_respawned)
        {
                numspawned += 1;
                maxcurrent += 1;