Shift movement cost/speed into IMove; regressions in a few areas

2010-06-25 17:05:56 +12:00
parent 6a5869f2c6
commit 29fa9e3aeb
20 changed files with 178 additions and 132 deletions
--- a/OpenRA.Mods.RA/Activities/ReturnToBase.cs
+++ b/OpenRA.Mods.RA/Activities/ReturnToBase.cs
@@ -53,7 +53,9 @@ namespace OpenRA.Mods.RA.Activities

 			var landPos = dest.CenterLocation;
 			var unit = self.traits.Get<Unit>();
-			var speed = .2f * Util.GetEffectiveSpeed(self, UnitMovementType.Fly);
+			var mobile = self.traits.WithInterface<IMove>().FirstOrDefault();
+			var speed = .2f * mobile.MovementSpeedForCell(self, self.Location);
+			
 			var approachStart = landPos - new float2(unit.Altitude * speed, 0);
 			var turnRadius = (128f / self.Info.Traits.Get<UnitInfo>().ROT) * speed / (float)Math.PI;