From c11b7041f4ae72c8b1e185520b6ace4d3a1810fe Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sun, 21 Aug 2011 21:32:39 +1200 Subject: [PATCH] push turret facing check down to turret --- OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs | 4 +--- OpenRA.Mods.RA/Attack/AttackTurreted.cs | 4 +--- OpenRA.Mods.RA/Turreted.cs | 6 ++++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs b/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs index e49eabec7c..e99e72a630 100644 --- a/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs +++ b/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs @@ -70,9 +70,7 @@ namespace OpenRA.Mods.RA return false; } - Turret.desiredFacing = Util.GetFacing( target.CenterLocation - self.CenterLocation, Turret.turretFacing ); - if( Turret.desiredFacing != Turret.turretFacing ) - return false; + if (!Turret.FaceTarget(self,target)) return false; return true; } diff --git a/OpenRA.Mods.RA/Attack/AttackTurreted.cs b/OpenRA.Mods.RA/Attack/AttackTurreted.cs index f8da09d29a..b3f6ec8a49 100644 --- a/OpenRA.Mods.RA/Attack/AttackTurreted.cs +++ b/OpenRA.Mods.RA/Attack/AttackTurreted.cs @@ -39,9 +39,7 @@ namespace OpenRA.Mods.RA return false; if (!target.IsValid) return false; - turret.desiredFacing = Util.GetFacing( target.CenterLocation - self.CenterLocation, turret.turretFacing ); - if( turret.desiredFacing != turret.turretFacing ) - return false; + if (!turret.FaceTarget(self, target)) return false; return base.CanAttack( self, target ); } diff --git a/OpenRA.Mods.RA/Turreted.cs b/OpenRA.Mods.RA/Turreted.cs index 6f7921abb7..b561764157 100755 --- a/OpenRA.Mods.RA/Turreted.cs +++ b/OpenRA.Mods.RA/Turreted.cs @@ -50,5 +50,11 @@ namespace OpenRA.Mods.RA var df = desiredFacing ?? ( facing != null ? facing.Facing : turretFacing ); turretFacing = Util.TickFacing(turretFacing, df, info.ROT); } + + public bool FaceTarget( Actor self, Target target ) + { + desiredFacing = Util.GetFacing( target.CenterLocation - self.CenterLocation, turretFacing ); + return turretFacing == desiredFacing; + } } }