diff options
| author | german77 <juangerman-13@hotmail.com> | 2021-10-27 18:06:13 -0500 |
|---|---|---|
| committer | Narr the Reg <juangerman-13@hotmail.com> | 2021-11-24 20:30:26 -0600 |
| commit | 2d3a63b28969089746e43ed232dc74630fbfc3b2 (patch) | |
| tree | f75d3245b6e23815611796c85b96fa4c7674c3e2 /src/core/hid/input_interpreter.cpp | |
| parent | c085e54316c5520ed7d58a92a7faa9e896bb6c71 (diff) | |
core/hid: Update structs to 13.1.0
Diffstat (limited to 'src/core/hid/input_interpreter.cpp')
| -rw-r--r-- | src/core/hid/input_interpreter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hid/input_interpreter.cpp b/src/core/hid/input_interpreter.cpp index 7e7c1816fd..870422d820 100644 --- a/src/core/hid/input_interpreter.cpp +++ b/src/core/hid/input_interpreter.cpp @@ -20,7 +20,7 @@ InputInterpreter::InputInterpreter(Core::System& system) InputInterpreter::~InputInterpreter() = default; void InputInterpreter::PollInput() { - const u32 button_state = npad.GetAndResetPressState(); + const u64 button_state = npad.GetAndResetPressState(); previous_index = current_index; current_index = (current_index + 1) % button_states.size(); @@ -32,7 +32,7 @@ void InputInterpreter::ResetButtonStates() { previous_index = 0; current_index = 0; - button_states[0] = 0xFFFFFFFF; + button_states[0] = 0xFFFFFFFFFFFFFFFF; for (std::size_t i = 1; i < button_states.size(); ++i) { button_states[i] = 0; @@ -40,22 +40,22 @@ void InputInterpreter::ResetButtonStates() { } bool InputInterpreter::IsButtonPressed(Core::HID::NpadButton button) const { - return (button_states[current_index] & static_cast<u32>(button)) != 0; + return (button_states[current_index] & static_cast<u64>(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; + const bool current_press = (button_states[current_index] & static_cast<u64>(button)) != 0; + const bool previous_press = (button_states[previous_index] & static_cast<u64>(button)) != 0; return current_press && !previous_press; } bool InputInterpreter::IsButtonHeld(Core::HID::NpadButton button) const { - u32 held_buttons{button_states[0]}; + u64 held_buttons{button_states[0]}; for (std::size_t i = 1; i < button_states.size(); ++i) { held_buttons &= button_states[i]; } - return (held_buttons & static_cast<u32>(button)) != 0; + return (held_buttons & static_cast<u64>(button)) != 0; } |