From d0bed067657804f6a18259948f120cbd70050971 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 6 Jul 2013 20:36:49 +1200 Subject: [PATCH] Use WVec overload of Util.GetFacing where possible. --- OpenRA.Game/Traits/Util.cs | 2 +- OpenRA.Mods.RA/Activities/Attack.cs | 2 +- OpenRA.Mods.RA/Air/Fly.cs | 2 +- OpenRA.Mods.RA/Air/HeliAttack.cs | 2 +- OpenRA.Mods.RA/Air/Land.cs | 4 ++-- OpenRA.Mods.RA/Attack/AttackFrontal.cs | 2 +- OpenRA.Mods.RA/Missions/MonsterTankMadnessScript.cs | 4 ++-- OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs | 2 +- OpenRA.Mods.RA/Turreted.cs | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/OpenRA.Game/Traits/Util.cs b/OpenRA.Game/Traits/Util.cs index c68b0d932e..dc87b9b473 100755 --- a/OpenRA.Game/Traits/Util.cs +++ b/OpenRA.Game/Traits/Util.cs @@ -45,7 +45,7 @@ namespace OpenRA.Traits return GetFacing(d.ToInt2(), currentFacing); } - public static int GetFacing( int2 d, int currentFacing ) + public static int GetFacing(int2 d, int currentFacing) { if (d == int2.Zero) return currentFacing; diff --git a/OpenRA.Mods.RA/Activities/Attack.cs b/OpenRA.Mods.RA/Activities/Attack.cs index 91b52e241a..28d00a3b68 100755 --- a/OpenRA.Mods.RA/Activities/Attack.cs +++ b/OpenRA.Mods.RA/Activities/Attack.cs @@ -73,7 +73,7 @@ namespace OpenRA.Mods.RA.Activities return (AllowMovement) ? Util.SequenceActivities(self.Trait().MoveWithinRange(Target, Range.Range / 1024), this) : NextActivity; } - var desiredFacing = Util.GetFacing(Target.CenterLocation - self.CenterLocation, 0); + var desiredFacing = Util.GetFacing(Target.CenterPosition - self.CenterPosition, 0); var facing = self.Trait(); if (facing.Facing != desiredFacing) return Util.SequenceActivities(new Turn(desiredFacing), this); diff --git a/OpenRA.Mods.RA/Air/Fly.cs b/OpenRA.Mods.RA/Air/Fly.cs index b5a08d103b..09f2ca2d81 100755 --- a/OpenRA.Mods.RA/Air/Fly.cs +++ b/OpenRA.Mods.RA/Air/Fly.cs @@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA.Air var aircraft = self.Trait(); - var desiredFacing = Util.GetFacing(d.ToInt2(), aircraft.Facing); + var desiredFacing = Util.GetFacing(d, aircraft.Facing); if (aircraft.Altitude == cruiseAltitude) aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, aircraft.ROT); diff --git a/OpenRA.Mods.RA/Air/HeliAttack.cs b/OpenRA.Mods.RA/Air/HeliAttack.cs index 38a8b8ae43..87e3de5eed 100755 --- a/OpenRA.Mods.RA/Air/HeliAttack.cs +++ b/OpenRA.Mods.RA/Air/HeliAttack.cs @@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA.Air } var attack = self.Trait(); - var dist = target.CenterLocation - self.CenterLocation; + var dist = target.CenterPosition - self.CenterPosition; var desiredFacing = Util.GetFacing(dist, aircraft.Facing); aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, aircraft.ROT); diff --git a/OpenRA.Mods.RA/Air/Land.cs b/OpenRA.Mods.RA/Air/Land.cs index ad028daa55..eb5d41f398 100755 --- a/OpenRA.Mods.RA/Air/Land.cs +++ b/OpenRA.Mods.RA/Air/Land.cs @@ -27,8 +27,8 @@ namespace OpenRA.Mods.RA.Air if (IsCanceled) return NextActivity; - var d = Target.CenterLocation - self.CenterLocation; - if (d.LengthSquared < 50) /* close enough */ + var d = Target.CenterPosition - self.CenterPosition; + if (d.LengthSquared < 256*256) // close enough (1/4 cell) return NextActivity; var aircraft = self.Trait(); diff --git a/OpenRA.Mods.RA/Attack/AttackFrontal.cs b/OpenRA.Mods.RA/Attack/AttackFrontal.cs index c93cffbd2a..4e5abbb442 100644 --- a/OpenRA.Mods.RA/Attack/AttackFrontal.cs +++ b/OpenRA.Mods.RA/Attack/AttackFrontal.cs @@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA return false; var facing = self.Trait().Facing; - var facingToTarget = Util.GetFacing(target.CenterLocation - self.CenterLocation, facing); + var facingToTarget = Util.GetFacing(target.CenterPosition - self.CenterPosition, facing); if (Math.Abs(facingToTarget - facing) % 256 > info.FacingTolerance) return false; diff --git a/OpenRA.Mods.RA/Missions/MonsterTankMadnessScript.cs b/OpenRA.Mods.RA/Missions/MonsterTankMadnessScript.cs index 58d189afee..622ebae34a 100644 --- a/OpenRA.Mods.RA/Missions/MonsterTankMadnessScript.cs +++ b/OpenRA.Mods.RA/Missions/MonsterTankMadnessScript.cs @@ -258,7 +258,7 @@ namespace OpenRA.Mods.RA.Missions { Sound.Play("reinfor1.aud"); foreach (var unit in units) - world.CreateActor(unit, greece, startEntryPoint.Location, Util.GetFacing(startBridgeEndPoint.CenterLocation - startEntryPoint.CenterLocation, 0)) + world.CreateActor(unit, greece, startEntryPoint.Location, Util.GetFacing(startBridgeEndPoint.CenterPosition - startEntryPoint.CenterPosition, 0)) .QueueActivity(new Move.Move(startMovePoint.Location, 0)); } @@ -266,7 +266,7 @@ namespace OpenRA.Mods.RA.Missions { Sound.Play("reinfor1.aud"); foreach (var unit in units) - world.CreateActor(unit, greece, alliedBaseEntryPoint.Location, Util.GetFacing(alliedBaseMovePoint.CenterLocation - alliedBaseEntryPoint.CenterLocation, 0)) + world.CreateActor(unit, greece, alliedBaseEntryPoint.Location, Util.GetFacing(alliedBaseMovePoint.CenterPosition - alliedBaseEntryPoint.CenterPosition, 0)) .QueueActivity(new Move.Move(alliedBaseMovePoint.Location, 0)); } diff --git a/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs b/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs index 3320fc1d2c..648f1a571a 100755 --- a/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs +++ b/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs @@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA { new LocationInit( enterCell ), new OwnerInit( self.Owner ), - new FacingInit( Util.GetFacing((order.TargetLocation - enterCell).ToInt2(), 0) ), + new FacingInit( Util.GetFacing(order.TargetLocation - enterCell, 0) ), new AltitudeInit( Rules.Info["u2"].Traits.Get().CruiseAltitude ), }); diff --git a/OpenRA.Mods.RA/Turreted.cs b/OpenRA.Mods.RA/Turreted.cs index d863bf90af..68dc809d55 100755 --- a/OpenRA.Mods.RA/Turreted.cs +++ b/OpenRA.Mods.RA/Turreted.cs @@ -71,7 +71,7 @@ namespace OpenRA.Mods.RA public bool FaceTarget(Actor self, Target target) { - desiredFacing = Util.GetFacing(target.CenterLocation - self.CenterLocation, turretFacing); + desiredFacing = Util.GetFacing(target.CenterPosition - self.CenterPosition, turretFacing); return turretFacing == desiredFacing; }