summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-03-20 12:55:59 +0100
committerMorph <39850852+Morph1984@users.noreply.github.com>2021-04-15 07:53:17 +0200
commitaa3adf6c3fc20171abcbd2678ed7ad6b3bd21a8e (patch)
treed81c7856c62646ed24a29360ad183731369592b9
parentqt_themes: Add styles for the On-Screen Keyboard and OverlayDialog (diff)
downloadyuzu-aa3adf6c3fc20171abcbd2678ed7ad6b3bd21a8e.tar
yuzu-aa3adf6c3fc20171abcbd2678ed7ad6b3bd21a8e.tar.gz
yuzu-aa3adf6c3fc20171abcbd2678ed7ad6b3bd21a8e.tar.bz2
yuzu-aa3adf6c3fc20171abcbd2678ed7ad6b3bd21a8e.tar.lz
yuzu-aa3adf6c3fc20171abcbd2678ed7ad6b3bd21a8e.tar.xz
yuzu-aa3adf6c3fc20171abcbd2678ed7ad6b3bd21a8e.tar.zst
yuzu-aa3adf6c3fc20171abcbd2678ed7ad6b3bd21a8e.zip
-rw-r--r--src/core/frontend/input_interpreter.cpp15
-rw-r--r--src/core/frontend/input_interpreter.h3
2 files changed, 17 insertions, 1 deletions
diff --git a/src/core/frontend/input_interpreter.cpp b/src/core/frontend/input_interpreter.cpp
index ec5fe660e..9f6a90e8f 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;
}
diff --git a/src/core/frontend/input_interpreter.h b/src/core/frontend/input_interpreter.h
index 73fc47ffb..9495e3daf 100644
--- a/src/core/frontend/input_interpreter.h
+++ b/src/core/frontend/input_interpreter.h
@@ -66,6 +66,9 @@ public:
/// Gets a button state from HID and inserts it into the array of button states.
void PollInput();
+ /// Resets all the button states to their defaults.
+ void ResetButtonStates();
+
/**
* Checks whether the button is pressed.
*