mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unnecessary else block

This commit is contained in:
Hielke Morsink 2021-09-13 23:25:33 +02:00
parent cf78d6841d
commit 2af5e0dc82
No known key found for this signature in database
GPG Key ID: FE0B343DF883E7F2
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/openrct2-ui/input/ShortcutManager.cpp
View File

@ -236,21 +236,19 @@ std::optional<ShortcutInput> ShortcutManager::ConvertLegacyBinding(uint16_t bind
{ {
return std::nullopt; return std::nullopt;
} }
else
{ ShortcutInput result;
ShortcutInput result; result.Kind = InputDeviceKind::Keyboard;
result.Kind = InputDeviceKind::Keyboard; if (binding & shift)
if (binding & shift) result.Modifiers |= KMOD_SHIFT;
result.Modifiers |= KMOD_SHIFT; if (binding & ctrl)
if (binding & ctrl) result.Modifiers |= KMOD_CTRL;
result.Modifiers |= KMOD_CTRL; if (binding & alt)
if (binding & alt) result.Modifiers |= KMOD_ALT;
result.Modifiers |= KMOD_ALT; if (binding & cmd)
if (binding & cmd) result.Modifiers |= KMOD_GUI;
result.Modifiers |= KMOD_GUI; result.Button = SDL_GetKeyFromScancode(static_cast<SDL_Scancode>(binding & 0xFF));
result.Button = SDL_GetKeyFromScancode(static_cast<SDL_Scancode>(binding & 0xFF)); return result;
return result;
}
} }
void ShortcutManager::LoadLegacyBindings(const fs::path& path) void ShortcutManager::LoadLegacyBindings(const fs::path& path)