Fix capturing etc

OpenRA · Feb 5, 2011 · de26b63 · de26b63
1 parent 4b0ab1c
commit de26b63
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/OpenRA.Mods.RA/Move/Mobile.cs b/OpenRA.Mods.RA/Move/Mobile.cs
@@ -308,7 +308,7 @@ public string VoicePhraseForOrder(Actor self, Order order)
 			}
         }
 
-		public SubCell GetDesiredSubcell(int2 a)
+		public SubCell GetDesiredSubcell(int2 a, Actor ignoreActor)
 		{
 			if (!Info.SharesCell)
 				return SubCell.FullCell;
@@ -317,7 +317,7 @@ public SubCell GetDesiredSubcell(int2 a)
 			return new[]{ __fromSubCell, SubCell.TopLeft, SubCell.TopRight, SubCell.Center,
 				SubCell.BottomLeft, SubCell.BottomRight}.First(b => 
 			{
-				var blockingActors = uim.GetUnitsAt(a,b);
+				var blockingActors = uim.GetUnitsAt(a,b).Where(c => c != ignoreActor);
 				if (blockingActors.Count() > 0)
 	            {
 	                // Non-sharable unit can enter a cell with shareable units only if it can crush all of them

diff --git a/OpenRA.Mods.RA/Move/Move.cs b/OpenRA.Mods.RA/Move/Move.cs
@@ -229,7 +229,7 @@ void NudgeBlocker(Actor self, int2 nextCell)
 			hasWaited = false;
 			path.RemoveAt( path.Count - 1 );
 
-			var subCell = mobile.GetDesiredSubcell(nextCell);
+			var subCell = mobile.GetDesiredSubcell(nextCell, ignoreBuilding);
 			return Pair.New(nextCell, subCell);
 		}