epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix infantry switching subcells and blocking eachother while moving.

Browse Source
This commit is contained in:
Paul Chote
2020-03-07 11:30:09 +00:00
committed by abcdefg30
parent c523ca8efe
commit 416713de0c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Activities/Move/Move.cs
View File

@@ -305,7 +305,7 @@ namespace OpenRA.Mods.Common.Activities
var newCell = path[path.Count - 1]; var newCell = path[path.Count - 1];
path.RemoveAt(path.Count - 1); path.RemoveAt(path.Count - 1);
return Pair.New(newCell, mobile.GetAvailableSubCell(nextCell, SubCell.Any, ignoreActor)); return Pair.New(newCell, mobile.GetAvailableSubCell(nextCell, mobile.FromSubCell, ignoreActor));
} }
else if (mobile.IsBlocking) else if (mobile.IsBlocking)
{ {
@@ -316,7 +316,7 @@ namespace OpenRA.Mods.Common.Activities
if ((nextCell - newCell).Value.LengthSquared > 2) if ((nextCell - newCell).Value.LengthSquared > 2)
path.Add(mobile.ToCell); path.Add(mobile.ToCell);
return Pair.New(newCell.Value, mobile.GetAvailableSubCell(newCell.Value, SubCell.Any, ignoreActor)); return Pair.New(newCell.Value, mobile.GetAvailableSubCell(newCell.Value, mobile.FromSubCell, ignoreActor));
} }
} }
@@ -326,7 +326,7 @@ namespace OpenRA.Mods.Common.Activities
hasWaited = false; hasWaited = false;
path.RemoveAt(path.Count - 1); path.RemoveAt(path.Count - 1);
return Pair.New(nextCell, mobile.GetAvailableSubCell(nextCell, SubCell.Any, ignoreActor)); return Pair.New(nextCell, mobile.GetAvailableSubCell(nextCell, mobile.FromSubCell, ignoreActor));
} }
protected override void OnLastRun(Actor self) protected override void OnLastRun(Actor self)