Add click sound to verb execution (#23162)

IDK how I didn't notice this before.
This commit is contained in:
metalgearsloth
2023-12-29 16:17:55 +11:00
committed by GitHub
parent bff7decef9
commit 93e1af2f8d

View File

@@ -24,7 +24,6 @@ namespace Content.Client.Verbs.UI
public sealed class VerbMenuUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState> public sealed class VerbMenuUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>
{ {
[Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private readonly ContextMenuUIController _context = default!; [Dependency] private readonly ContextMenuUIController _context = default!;
[UISystemDependency] private readonly CombatModeSystem _combatMode = default!; [UISystemDependency] private readonly CombatModeSystem _combatMode = default!;
@@ -112,7 +111,7 @@ namespace Content.Client.Verbs.UI
// Show the menu at mouse pos // Show the menu at mouse pos
menu.SetPositionLast(); menu.SetPositionLast();
var box = UIBox2.FromDimensions(_userInterfaceManager.MousePositionScaled.Position, new Vector2(1, 1)); var box = UIBox2.FromDimensions(UIManager.MousePositionScaled.Position, new Vector2(1, 1));
menu.Open(box); menu.Open(box);
} }
@@ -274,6 +273,7 @@ namespace Content.Client.Verbs.UI
private void ExecuteVerb(Verb verb) private void ExecuteVerb(Verb verb)
{ {
UIManager.ClickSound();
_verbSystem.ExecuteVerb(CurrentTarget, verb); _verbSystem.ExecuteVerb(CurrentTarget, verb);
if (verb.CloseMenu ?? verb.CloseMenuDefault) if (verb.CloseMenu ?? verb.CloseMenuDefault)