mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Code Issues Releases Wiki Activity

Rename members of InputEvent

Browse Source
This commit is contained in:
Gymnasiast
2025-09-30 22:27:30 +02:00
parent 04daf426df
commit 7e610eae21
5 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2-ui/input/ShortcutInput.cpp
View File

@@ -399,9 +399,9 @@ static bool CompareModifiers(uint32_t shortcut, uint32_t actual)
bool ShortcutInput::Matches(const InputEvent& e) const
{
if (CompareModifiers(Modifiers, e.Modifiers))
if (CompareModifiers(Modifiers, e.modifiers))
{
if (e.DeviceKind == Kind && Button == e.Button)
if (e.deviceKind == Kind && Button == e.button)
{
return true;
}
@@ -412,7 +412,7 @@ bool ShortcutInput::Matches(const InputEvent& e) const
std::optional<ShortcutInput> ShortcutInput::FromInputEvent(const InputEvent& e)
{
// Assume any side modifier (more specific configurations can be done by manually editing config file)
auto modifiers = e.Modifiers & kUsefulModifiers;
auto modifiers = e.modifiers & kUsefulModifiers;
for (auto mod : { KMOD_CTRL, KMOD_SHIFT, KMOD_ALT, KMOD_GUI })
{
if (modifiers & mod)
@@ -422,8 +422,8 @@ std::optional<ShortcutInput> ShortcutInput::FromInputEvent(const InputEvent& e)
}
ShortcutInput result;
result.Kind = e.DeviceKind;
result.Kind = e.deviceKind;
result.Modifiers = modifiers;
result.Button = e.Button;
result.Button = e.button;
return result;
}