From c1fd42202f35dcddbf2dc6215fcf462bf31e5ce3 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Tue, 23 Jan 2024 20:26:45 -0500 Subject: [PATCH] Holding the walk button no longer activates sprite movement state (#24455) * Dancing is forbidden * Suggested changes --- Content.Client/Movement/Systems/SpriteMovementSystem.cs | 4 ++-- .../Movement/Systems/SharedMoverController.Input.cs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Content.Client/Movement/Systems/SpriteMovementSystem.cs b/Content.Client/Movement/Systems/SpriteMovementSystem.cs index 37045c5f0d..313683855d 100644 --- 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 dde4ac063b..6fb8c64b8e 100644 --- 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] -- 2.51.2