diff options
| author | german77 <juangerman-13@hotmail.com> | 2021-09-20 20:53:04 -0500 |
|---|---|---|
| committer | Narr the Reg <juangerman-13@hotmail.com> | 2021-11-24 20:30:24 -0600 |
| commit | e14ae06391ac724e4be4557df0568846687a3662 (patch) | |
| tree | 3db695f4e13214aa638c182e66f94f156b8f5115 /src/core/hid/input_interpreter.cpp | |
| parent | 1b82d5bb4f9440603e7af0af6abed7968aef37e4 (diff) | |
core: Update input interpreter
Diffstat (limited to 'src/core/hid/input_interpreter.cpp')
| -rw-r--r-- | src/core/hid/input_interpreter.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/core/hid/input_interpreter.cpp b/src/core/hid/input_interpreter.cpp index c33d8a11ad..7e7c1816fd 100644 --- a/src/core/hid/input_interpreter.cpp +++ b/src/core/hid/input_interpreter.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "core/core.h" +#include "core/hid/hid_types.h" #include "core/hid/input_interpreter.h" #include "core/hle/service/hid/controllers/npad.h" #include "core/hle/service/hid/hid.h" @@ -38,25 +39,23 @@ void InputInterpreter::ResetButtonStates() { } } -bool InputInterpreter::IsButtonPressed(HIDButton button) const { - return (button_states[current_index] & (1U << static_cast<u8>(button))) != 0; +bool InputInterpreter::IsButtonPressed(Core::HID::NpadButton button) const { + return (button_states[current_index] & static_cast<u32>(button)) != 0; } -bool InputInterpreter::IsButtonPressedOnce(HIDButton button) const { - const bool current_press = - (button_states[current_index] & (1U << static_cast<u8>(button))) != 0; - const bool previous_press = - (button_states[previous_index] & (1U << static_cast<u8>(button))) != 0; +bool InputInterpreter::IsButtonPressedOnce(Core::HID::NpadButton button) const { + const bool current_press = (button_states[current_index] & static_cast<u32>(button)) != 0; + const bool previous_press = (button_states[previous_index] & static_cast<u32>(button)) != 0; return current_press && !previous_press; } -bool InputInterpreter::IsButtonHeld(HIDButton button) const { +bool InputInterpreter::IsButtonHeld(Core::HID::NpadButton button) const { u32 held_buttons{button_states[0]}; for (std::size_t i = 1; i < button_states.size(); ++i) { held_buttons &= button_states[i]; } - return (held_buttons & (1U << static_cast<u8>(button))) != 0; + return (held_buttons & static_cast<u32>(button)) != 0; } |