fix some dumbness in Production/ITeleportable

Mailaender · Jan 2, 2011 · 2048900 · 2048900
1 parent 7b5a8cf
commit 2048900
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs
@@ -122,6 +122,7 @@ public interface ITeleportable : IHasLocation /* crap name! */
 		bool CanEnterCell(int2 location);
 		void SetPosition(Actor self, int2 cell);
 		void SetPxPosition(Actor self, int2 px);
+		void AdjustPxPosition(Actor self, int2 px);	/* works like SetPxPosition, but visual only */
 	}
 
 	public interface IMove : ITeleportable

diff --git a/OpenRA.Mods.RA/Air/Aircraft.cs b/OpenRA.Mods.RA/Air/Aircraft.cs
@@ -69,6 +69,8 @@ public void SetPxPosition( Actor self, int2 px )
 			SubPxPosition = px * 1024;
 		}
 
+		public void AdjustPxPosition(Actor self, int2 px) { SetPxPosition(self, px); }
+
 		public bool AircraftCanEnter(Actor a)
 		{
 			if( self.Owner != a.Owner ) return false;

diff --git a/OpenRA.Mods.RA/Crate.cs b/OpenRA.Mods.RA/Crate.cs
@@ -89,6 +89,8 @@ public void SetPxPosition( Actor self, int2 px )
 			SetPosition( self, Util.CellContaining( px ) );
 		}
 
+		public void AdjustPxPosition(Actor self, int2 px) { SetPxPosition(self, px); }
+
 		public bool CanEnterCell(int2 cell)
 		{
 			if (!self.World.Map.IsInMap(cell.X, cell.Y)) return false;

diff --git a/OpenRA.Mods.RA/Move/Mobile.cs b/OpenRA.Mods.RA/Move/Mobile.cs
@@ -185,6 +185,11 @@ public void SetPxPosition(Actor self, int2 px)
             FinishedMoving(self);
         }
 
+		public void AdjustPxPosition(Actor self, int2 px)	/* visual hack only */
+		{
+			PxPosition = px;
+		}
+
         public IEnumerable<IOrderTargeter> Orders { get { yield return new MoveOrderTargeter(Info); } }
 
         // Note: Returns a valid order even if the unit can't move to the target

diff --git a/OpenRA.Mods.RA/Production.cs b/OpenRA.Mods.RA/Production.cs
@@ -57,7 +57,7 @@ public void DoProduction(Actor self, ActorInfo producee, ExitInfo exitinfo)
 			// Set the physical position of the unit as the exit cell
 			teleportable.SetPosition(newUnit,exit);
 			var to = Util.CenterOfCell(exit);
-            teleportable.SetPxPosition(newUnit, spawn);
+            teleportable.AdjustPxPosition(newUnit, spawn);
 			if (facing != null)
 				facing.Facing = exitinfo.Facing < 0 ? Util.GetFacing(to - spawn, facing.Facing) : exitinfo.Facing;
 			self.World.Add(newUnit);
@@ -84,15 +84,15 @@ static int2 MoveToRallyPoint(Actor self, Actor newUnit, int2 exitLocation)
             if (rp == null)
                 return exitLocation;
 
-            var mobile = self.TraitOrDefault<Mobile>();
+            var mobile = newUnit.TraitOrDefault<Mobile>();
             if (mobile != null)
             {
                 newUnit.QueueActivity(mobile.MoveTo(rp.rallyPoint, 1));
                 return rp.rallyPoint;
             }
 
             // todo: don't talk about HeliFly here.
-            var helicopter = self.TraitOrDefault<Helicopter>();
+            var helicopter = newUnit.TraitOrDefault<Helicopter>();
             if (helicopter != null)
             {
                 newUnit.QueueActivity(new HeliFly(Util.CenterOfCell(rp.rallyPoint)));