remove unnecessary parameters from Aircraft.MovementSpeedForCell, and…

… rename to MovementSpeed
Mailaender · Nov 5, 2010 · 5c0cd50 · 5c0cd50
1 parent 8129d5d
commit 5c0cd50
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/OpenRA.Mods.RA/Activities/Fly.cs b/OpenRA.Mods.RA/Activities/Fly.cs
@@ -57,7 +57,7 @@ public static class FlyUtil
 		public static void Fly(Actor self, int desiredAltitude )
 		{
 			var aircraft = self.Trait<Aircraft>();
-			var speed = .2f * aircraft.MovementSpeedForCell(self, self.Location);
+			var speed = .2f * aircraft.MovementSpeed;
 			var angle = aircraft.Facing / 128f * Math.PI;
 			aircraft.center += speed * -float2.FromAngle((float)angle);
 			aircraft.Altitude += Math.Sign(desiredAltitude - aircraft.Altitude);

diff --git a/OpenRA.Mods.RA/Activities/HeliAttack.cs b/OpenRA.Mods.RA/Activities/HeliAttack.cs
@@ -45,7 +45,7 @@ public override IActivity Tick(Actor self)
 
 			var desiredFacing = Util.GetFacing(dist, aircraft.Facing);
 			aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, aircraft.ROT);
-			var rawSpeed = .2f * aircraft.MovementSpeedForCell(self, self.Location);
+			var rawSpeed = .2f * aircraft.MovementSpeed;
 
 			if (!float2.WithinEpsilon(float2.Zero, dist, range * Game.CellSize))
 				aircraft.center += (rawSpeed / dist.Length) * dist;

diff --git a/OpenRA.Mods.RA/Activities/HeliFly.cs b/OpenRA.Mods.RA/Activities/HeliFly.cs
@@ -46,7 +46,7 @@ public override IActivity Tick(Actor self)
 			aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, 
 				aircraft.ROT);
 
-			var rawSpeed = .2f * aircraft.MovementSpeedForCell(self, self.Location);
+			var rawSpeed = .2f * aircraft.MovementSpeed;
 			aircraft.center += (rawSpeed / dist.Length) * dist;
 
 			return this;

diff --git a/OpenRA.Mods.RA/Activities/Land.cs b/OpenRA.Mods.RA/Activities/Land.cs
@@ -38,7 +38,7 @@ public override IActivity Tick(Actor self)
 
 			var desiredFacing = Util.GetFacing(d, aircraft.Facing);
 			aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, aircraft.ROT);
-			var speed = .2f * aircraft.MovementSpeedForCell(self, self.Location);
+			var speed = .2f * aircraft.MovementSpeed;
 			var angle = aircraft.Facing / 128f * Math.PI;
 
 			aircraft.center += speed * -float2.FromAngle((float)angle);

diff --git a/OpenRA.Mods.RA/Activities/ReturnToBase.cs b/OpenRA.Mods.RA/Activities/ReturnToBase.cs
@@ -48,7 +48,7 @@ void Calculate(Actor self)
 			var landPos = dest.CenterLocation;
 			var aircraft = self.Trait<Aircraft>();
 
-			var speed = .2f * aircraft.MovementSpeedForCell(self, self.Location);
+			var speed = .2f * aircraft.MovementSpeed;
 
 			var approachStart = landPos - new float2(aircraft.Altitude * speed, 0);
 			var turnRadius = (128f / self.Info.Traits.Get<AircraftInfo>().ROT) * speed / (float)Math.PI;

diff --git a/OpenRA.Mods.RA/Aircraft.cs b/OpenRA.Mods.RA/Aircraft.cs
@@ -80,14 +80,17 @@ public bool AircraftCanEnter(Actor a)
 		}
 
 		public bool CanEnterCell(int2 location) { return true; }
-
-		public float MovementSpeedForCell(Actor self, int2 cell)
-		{		
-			var modifier = self
-				.TraitsImplementing<ISpeedModifier>()
-				.Select(t => t.GetSpeedModifier())
-				.Product();
-			return Info.Speed * modifier;
+
+		public float MovementSpeed
+		{
+			get
+			{
+				var modifier = self
+					.TraitsImplementing<ISpeedModifier>()
+					.Select( t => t.GetSpeedModifier() )
+					.Product();
+				return Info.Speed * modifier;
+			}
 		}
 
 		int2[] noCells = new int2[] { };

diff --git a/OpenRA.Mods.RA/Helicopter.cs b/OpenRA.Mods.RA/Helicopter.cs
@@ -133,7 +133,7 @@ public void Tick(Actor self)
 			if (aircraft.Altitude <= 0)
 				return;
 
-			var rawSpeed = .2f * aircraft.MovementSpeedForCell(self, self.Location);
+			var rawSpeed = .2f * aircraft.MovementSpeed;
 			var otherHelis = self.World.FindUnitsInCircle(self.CenterLocation, Info.IdealSeparation)
 				.Where(a => a.HasTrait<Helicopter>());