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

Fix Mobile actors turning even if Mobile is paused

Browse Source
This commit is contained in:
reaperrr
2019-04-13 19:55:41 +02:00
committed by reaperrr
parent cc7e758b27
commit db68c6e264
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/Turn.cs
View File

@@ -17,13 +17,13 @@ namespace OpenRA.Mods.Common.Activities
{ {
public class Turn : Activity public class Turn : Activity
{ {
readonly IDisabledTrait disablable; readonly Mobile mobile;
readonly IFacing facing; readonly IFacing facing;
readonly int desiredFacing; readonly int desiredFacing;
public Turn(Actor self, int desiredFacing) public Turn(Actor self, int desiredFacing)
{ {
disablable = self.TraitOrDefault<IMove>() as IDisabledTrait; mobile = self.TraitOrDefault<Mobile>();
facing = self.Trait<IFacing>(); facing = self.Trait<IFacing>();
this.desiredFacing = desiredFacing; this.desiredFacing = desiredFacing;
} }
@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Activities
if (IsCanceling) if (IsCanceling)
return NextActivity; return NextActivity;
if (disablable != null && disablable.IsTraitDisabled) if (mobile != null && (mobile.IsTraitDisabled || mobile.IsTraitPaused))
return this; return this;
if (desiredFacing == facing.Facing) if (desiredFacing == facing.Facing)