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

Include tunnel check in CanStayInCell.

Browse Source
This commit is contained in:
tovl
2019-10-01 20:38:48 +02:00
committed by Paul Chote
parent 196d9670d3
commit 2094142b7d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,9 +158,7 @@ namespace OpenRA.Mods.Common.Activities
{ {
mobile.TurnToMove = false; mobile.TurnToMove = false;
// If the actor is inside a tunnel then we must let them move if (IsCanceling && mobile.CanStayInCell(mobile.ToCell))
// all the way through before moving to the next activity
if (IsCanceling && self.Location.Layer != CustomMovementLayerType.Tunnel && mobile.CanStayInCell(mobile.ToCell))
{ {
if (path != null) if (path != null)
path.Clear(); path.Clear();

3
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -109,6 +109,9 @@ namespace OpenRA.Mods.Common.Traits
locomotor = world.WorldActor.TraitsImplementing<Locomotor>() locomotor = world.WorldActor.TraitsImplementing<Locomotor>()
.SingleOrDefault(l => l.Info.Name == Locomotor); .SingleOrDefault(l => l.Info.Name == Locomotor);
if (cell.Layer == CustomMovementLayerType.Tunnel)
return false;
return locomotor.CanStayInCell(cell); return locomotor.CanStayInCell(cell);
} }