Holding the walk button no longer activates sprite movement state (#24455)

* Dancing is forbidden

* Suggested changes

diff --git a/Content.Client/Movement/Systems/SpriteMovementSystem.cs b/Content.Client/Movement/Systems/SpriteMovementSystem.cs
index 37045c5f0d3c94b907107231a9aa5b7255008351..313683855d025b542f72f28d08a88ca7870086ac 100644 (file)
--- a/Content.Client/Movement/Systems/SpriteMovementSystem.cs
+++ b/Content.Client/Movement/Systems/SpriteMovementSystem.cs
@@ -27,8 +27,8 @@ public sealed class SpriteMovementSystem : EntitySystem
         if (!_timing.IsFirstTimePredicted)
             return;
 
-        var oldMoving = SharedMoverController.GetNormalizedMovement(args.OldMovement) != MoveButtons.None;
-        var moving = SharedMoverController.GetNormalizedMovement(args.Component.HeldMoveButtons) != MoveButtons.None;
+        var oldMoving = (SharedMoverController.GetNormalizedMovement(args.OldMovement) & MoveButtons.AnyDirection) != MoveButtons.None;
+        var moving = (SharedMoverController.GetNormalizedMovement(args.Component.HeldMoveButtons) & MoveButtons.AnyDirection) != MoveButtons.None;
 
         if (oldMoving == moving || !_spriteQuery.TryGetComponent(uid, out var sprite))
             return;

diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
index dde4ac063bdbaae86b30450b61268c3f77445d3a..6fb8c64b8e77d5b2526a434ce2b9039e45bd39f2 100644 (file)
--- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
@@ -626,6 +626,7 @@ namespace Content.Shared.Movement.Systems
         Left = 4,
         Right = 8,
         Walk = 16,
+        AnyDirection = Up | Down | Left | Right,
     }
 
     [Flags]