From 255bb9ce381eeb0989a5b8efb3d41c88a0f2c642 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Sat, 13 Mar 2021 13:35:59 -0500 Subject: Disabled mute shortcut while on menu Mostly because pressing M while the settings menu is open would not cause the music slider to go down automatically. #7 --- src/input_system.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/input_system.cpp') diff --git a/src/input_system.cpp b/src/input_system.cpp index 3e4b679..56516ac 100644 --- a/src/input_system.cpp +++ b/src/input_system.cpp @@ -59,11 +59,13 @@ void InputSystem::tick(double dt) { char* clipboardText = SDL_GetClipboardText(); debugText_.append(clipboardText); SDL_free(clipboardText); - } else if (!debugConsole_ && e.key.keysym.sym == SDLK_m) { - if (game_.getMixer().isMusicMuted()) { - game_.getMixer().unmuteMusic(); - } else { - game_.getMixer().muteMusic(); + } else if (e.key.keysym.sym == SDLK_m) { + if (!debugConsole_ && !game_.getSystem().isMenuOpen()) { + if (game_.getMixer().isMusicMuted()) { + game_.getMixer().unmuteMusic(); + } else { + game_.getMixer().muteMusic(); + } } } else if (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT) { if (game_.isGameplayPaused()) continue; -- cgit 1.4.1