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 d1bf0893192e03bf755bae18f8568c819c142d9b..32e4a24dc99718289d1da67991f0ddd770d3f752 100644 (file)
--- a/qcsrc/server/tturrets/units/unit_fusionreactor.qc
+++ b/qcsrc/server/tturrets/units/unit_fusionreactor.qc
@@ -7,11 +7,6 @@ void turret_fusionreactor_fire()
     vector fl_org;
 
     self.enemy.ammo = min(self.enemy.ammo + self.shot_dmg,self.enemy.ammo_max);
-    if(g_td) // auto heal monsters in tower defense
-       {
-        self.enemy.health = min(self.enemy.health + self.shot_dmg,self.enemy.max_health);
-               self.enemy.SendFlags |= MSF_STATUS;
-       }
     fl_org = 0.5 * (self.enemy.absmin + self.enemy.absmax);
     te_smallflash(fl_org);
 }
@@ -47,23 +42,11 @@ float turret_fusionreactor_firecheck()
        
        if (vlen(self.enemy.origin - self.origin) > self.target_range)
                return 0;       
-
-    if(g_td)
-    {
-        if(self.enemy.health >= self.enemy.max_health)
-            return 0;
-                       
-               if(IsDifferentTeam(self.enemy, self))
-                       return 0;
-                       
-               if(self.enemy.flags & FL_MONSTER)
-                       return 1; // the following checks are for turrets only
-    }
        
        if (self.enemy.ammo >= self.enemy.ammo_max)
                return 0;
        
-       if(teamplay && self.team != self.enemy.team)
+       if(DIFF_TEAM(self, self.enemy))
                return 0;
        
        if not (self.enemy.ammo_flags & TFL_AMMO_ENERGY)