diff options
author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-03-20 07:55:59 -0400 |
---|---|---|
committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-04-15 01:53:17 -0400 |
commit | aa3adf6c3fc20171abcbd2678ed7ad6b3bd21a8e (patch) | |
tree | d81c7856c62646ed24a29360ad183731369592b9 /src/core/frontend/input_interpreter.cpp | |
parent | f6e6913f8ff5f533e69a5831a81ca8f15f709baf (diff) |
input_interpreter: Fix button hold being interpreted incorrectly on init
We reset all the button states to 0 except the first index (which has all the buttons as pressed) to prevent a button hold being interpreted as a button that was pressed once on the first poll.
Diffstat (limited to 'src/core/frontend/input_interpreter.cpp')
-rw-r--r-- | src/core/frontend/input_interpreter.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/core/frontend/input_interpreter.cpp b/src/core/frontend/input_interpreter.cpp index ec5fe660ed..9f6a90e8f1 100644 --- a/src/core/frontend/input_interpreter.cpp +++ b/src/core/frontend/input_interpreter.cpp @@ -12,7 +12,9 @@ InputInterpreter::InputInterpreter(Core::System& system) : npad{system.ServiceManager() .GetService<Service::HID::Hid>("hid") ->GetAppletResource() - ->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad)} {} + ->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad)} { + ResetButtonStates(); +} InputInterpreter::~InputInterpreter() = default; @@ -25,6 +27,17 @@ void InputInterpreter::PollInput() { button_states[current_index] = button_state; } +void InputInterpreter::ResetButtonStates() { + previous_index = 0; + current_index = 0; + + button_states[0] = 0xFFFFFFFF; + + for (std::size_t i = 1; i < button_states.size(); ++i) { + button_states[i] = 0; + } +} + bool InputInterpreter::IsButtonPressed(HIDButton button) const { return (button_states[current_index] & (1U << static_cast<u8>(button))) != 0; } |