Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / tturrets / units / unit_fusionreactor.qc

diff --git a/qcsrc/server/tturrets/units/unit_fusionreactor.qc b/qcsrc/server/tturrets/units/unit_fusionreactor.qc
index 8118b8f234dfa1cb23d2c52d737489679dd47ab1..32e4a24dc99718289d1da67991f0ddd770d3f752 100644 (file)
--- a/qcsrc/server/tturrets/units/unit_fusionreactor.qc
+++ b/qcsrc/server/tturrets/units/unit_fusionreactor.qc
@@ -38,15 +38,15 @@ float turret_fusionreactor_firecheck()
                return 0;
 
        if (self.ammo < self.shot_dmg)
-               return 0;
-
-       if (self.enemy.ammo >= self.enemy.ammo_max)
-               return 0;
+               return 0;       
        
        if (vlen(self.enemy.origin - self.origin) > self.target_range)
-               return 0;                               
+               return 0;       
+       
+       if (self.enemy.ammo >= self.enemy.ammo_max)
+               return 0;
        
-       if(self.team != self.enemy.team)
+       if(DIFF_TEAM(self, self.enemy))
                return 0;
        
        if not (self.enemy.ammo_flags & TFL_AMMO_ENERGY)