Added int subCell = -1 to IMove.MoveIntoWorld & IPositionable.SetPosition(Actor self, CPos cell)

2014-07-29 14:40:22 -05:00
parent 921d77f825
commit fe57417aa8
8 changed files with 24 additions and 11 deletions
--- a/OpenRA.Game/Traits/World/ActorMap.cs
+++ b/OpenRA.Game/Traits/World/ActorMap.cs
@@ -88,8 +88,11 @@ namespace OpenRA.Traits
 			return FreeSubCell(a) >= 0;
 		}

-		public int FreeSubCell(CPos a)
+		public int FreeSubCell(CPos a, int preferredSubCell = -1)
 		{
+			if (preferredSubCell >= 0 && !AnyUnitsAt(a, preferredSubCell))
+				return preferredSubCell;
+
 			if (!AnyUnitsAt(a))
 				return map.SubCellDefaultIndex;