From 2af5e0dc8224b13f46d647b0c601882da1a74077 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Mon, 13 Sep 2021 23:25:33 +0200 Subject: [PATCH] Remove unnecessary else block --- src/openrct2-ui/input/ShortcutManager.cpp | 28 +++++++++++------------ 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/openrct2-ui/input/ShortcutManager.cpp b/src/openrct2-ui/input/ShortcutManager.cpp index 7934d3d7f0..6741ad08e3 100644 --- a/src/openrct2-ui/input/ShortcutManager.cpp +++ b/src/openrct2-ui/input/ShortcutManager.cpp @@ -236,21 +236,19 @@ std::optional ShortcutManager::ConvertLegacyBinding(uint16_t bind { return std::nullopt; } - else - { - ShortcutInput result; - result.Kind = InputDeviceKind::Keyboard; - if (binding & shift) - result.Modifiers |= KMOD_SHIFT; - if (binding & ctrl) - result.Modifiers |= KMOD_CTRL; - if (binding & alt) - result.Modifiers |= KMOD_ALT; - if (binding & cmd) - result.Modifiers |= KMOD_GUI; - result.Button = SDL_GetKeyFromScancode(static_cast(binding & 0xFF)); - return result; - } + + ShortcutInput result; + result.Kind = InputDeviceKind::Keyboard; + if (binding & shift) + result.Modifiers |= KMOD_SHIFT; + if (binding & ctrl) + result.Modifiers |= KMOD_CTRL; + if (binding & alt) + result.Modifiers |= KMOD_ALT; + if (binding & cmd) + result.Modifiers |= KMOD_GUI; + result.Button = SDL_GetKeyFromScancode(static_cast(binding & 0xFF)); + return result; } void ShortcutManager::LoadLegacyBindings(const fs::path& path)