epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use WVec overload of Util.GetFacing where possible.

Browse Source
This commit is contained in:
Paul Chote
2013-07-06 20:36:49 +12:00
parent 7883b1bd7f
commit d0bed06765
9 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Traits/Util.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Traits
return GetFacing(d.ToInt2(), currentFacing); 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) if (d == int2.Zero)
return currentFacing; return currentFacing;

2
OpenRA.Mods.RA/Activities/Attack.cs
View File

@@ -73,7 +73,7 @@ namespace OpenRA.Mods.RA.Activities
return (AllowMovement) ? Util.SequenceActivities(self.Trait<Mobile>().MoveWithinRange(Target, Range.Range / 1024), this) : NextActivity; return (AllowMovement) ? Util.SequenceActivities(self.Trait<Mobile>().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<IFacing>(); var facing = self.Trait<IFacing>();
if (facing.Facing != desiredFacing) if (facing.Facing != desiredFacing)
return Util.SequenceActivities(new Turn(desiredFacing), this); return Util.SequenceActivities(new Turn(desiredFacing), this);

2
OpenRA.Mods.RA/Air/Fly.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA.Air
var aircraft = self.Trait<Aircraft>(); var aircraft = self.Trait<Aircraft>();
var desiredFacing = Util.GetFacing(d.ToInt2(), aircraft.Facing); var desiredFacing = Util.GetFacing(d, aircraft.Facing);
if (aircraft.Altitude == cruiseAltitude) if (aircraft.Altitude == cruiseAltitude)
aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, aircraft.ROT); aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, aircraft.ROT);

2
OpenRA.Mods.RA/Air/HeliAttack.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA.Air
} }
var attack = self.Trait<AttackHeli>(); var attack = self.Trait<AttackHeli>();
var dist = target.CenterLocation - self.CenterLocation; var dist = target.CenterPosition - self.CenterPosition;
var desiredFacing = Util.GetFacing(dist, aircraft.Facing); var desiredFacing = Util.GetFacing(dist, aircraft.Facing);
aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, aircraft.ROT); aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, aircraft.ROT);

4
OpenRA.Mods.RA/Air/Land.cs
View File

@@ -27,8 +27,8 @@ namespace OpenRA.Mods.RA.Air
if (IsCanceled) return NextActivity; if (IsCanceled) return NextActivity;
var d = Target.CenterLocation - self.CenterLocation; var d = Target.CenterPosition - self.CenterPosition;
if (d.LengthSquared < 50) /* close enough */ if (d.LengthSquared < 256*256) // close enough (1/4 cell)
return NextActivity; return NextActivity;
var aircraft = self.Trait<Aircraft>(); var aircraft = self.Trait<Aircraft>();

2
OpenRA.Mods.RA/Attack/AttackFrontal.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA
return false; return false;
var facing = self.Trait<IFacing>().Facing; var facing = self.Trait<IFacing>().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) if (Math.Abs(facingToTarget - facing) % 256 > info.FacingTolerance)
return false; return false;

4
OpenRA.Mods.RA/Missions/MonsterTankMadnessScript.cs
View File

@@ -258,7 +258,7 @@ namespace OpenRA.Mods.RA.Missions
{ {
Sound.Play("reinfor1.aud"); Sound.Play("reinfor1.aud");
foreach (var unit in units) 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)); .QueueActivity(new Move.Move(startMovePoint.Location, 0));
} }
@@ -266,7 +266,7 @@ namespace OpenRA.Mods.RA.Missions
{ {
Sound.Play("reinfor1.aud"); Sound.Play("reinfor1.aud");
foreach (var unit in units) 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)); .QueueActivity(new Move.Move(alliedBaseMovePoint.Location, 0));
} }

2
OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA
{ {
new LocationInit( enterCell ), new LocationInit( enterCell ),
new OwnerInit( self.Owner ), 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<PlaneInfo>().CruiseAltitude ), new AltitudeInit( Rules.Info["u2"].Traits.Get<PlaneInfo>().CruiseAltitude ),
}); });

2
OpenRA.Mods.RA/Turreted.cs
View File

@@ -71,7 +71,7 @@ namespace OpenRA.Mods.RA
public bool FaceTarget(Actor self, Target target) 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; return turretFacing == desiredFacing;
} }