X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Ftturrets%2Funits%2Funit_fusionreactor.qc;h=32e4a24dc99718289d1da67991f0ddd770d3f752;hp=e9db03fff3f8509c052c38361b2a6df0b5adb39d;hb=2c0e35d3ee9fe6652c9c56f29dbbf546da0043b0;hpb=49e38e46261f04cd3208ac6f26aa00f5c567020b

diff --git a/qcsrc/server/tturrets/units/unit_fusionreactor.qc b/qcsrc/server/tturrets/units/unit_fusionreactor.qc
index e9db03fff3..32e4a24dc9 100644
--- a/qcsrc/server/tturrets/units/unit_fusionreactor.qc
+++ b/qcsrc/server/tturrets/units/unit_fusionreactor.qc
@@ -7,12 +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 repair?
-	{
-        self.enemy.health = min(self.enemy.health + self.shot_dmg,self.enemy.max_health);
-		self.enemy.tur_health = min(self.enemy.tur_health + self.shot_dmg,self.enemy.max_health);
-		self.enemy.SendFlags |= TNSF_STATUS;
-	}
     fl_org = 0.5 * (self.enemy.absmin + self.enemy.absmax);
     te_smallflash(fl_org);
 }
@@ -48,23 +42,11 @@ float turret_fusionreactor_firecheck()
 	
 	if (vlen(self.enemy.origin - self.origin) > self.target_range)
 		return 0;	
-
-    if(g_td)
-    {
-        if(self.realowner != self.enemy.realowner)
-            return 0;
-            
-		if(self.enemy.turrcaps_flags & TFL_TURRCAPS_AMMOSOURCE)
-			return 0;
-			
-        if(self.enemy.health >= self.enemy.max_health)
-            return 0;
-    }
 	
 	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)