config menu: stop exiting the category for certain items

wiiu-env · Apr 28, 2024 · 958ba50 · 958ba50
1 parent 2b29db1
commit 958ba50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/source/utils/config/ConfigUtils.cpp b/source/utils/config/ConfigUtils.cpp
@@ -152,8 +152,6 @@ void ConfigUtils::displayMenu() {
             baseInput.lastData = baseInput.data;
         }
 
-        baseInput.process();
-
         WUPSConfigSimplePadData simpleData;
         simpleData.buttons_d    = convertInputs(baseInput.data.buttons_d);
         simpleData.buttons_r    = convertInputs(baseInput.data.buttons_r);

diff --git a/source/utils/input/CombinedInput.h b/source/utils/input/CombinedInput.h
@@ -3,6 +3,8 @@
 class CombinedInput : public Input {
 public:
     void combine(const Input &b) {
+        data.buttons_d |= b.data.buttons_d;
+        data.buttons_r |= b.data.buttons_r;
         data.buttons_h |= b.data.buttons_h;
         if (!data.touched) {
             data.touched = b.data.touched;
@@ -15,12 +17,6 @@ class CombinedInput : public Input {
         }
     }
 
-    void process() {
-        data.buttons_d |= (data.buttons_h & (~lastData.buttons_h));
-        data.buttons_r |= (lastData.buttons_h & (~data.buttons_h));
-        lastData.buttons_h = data.buttons_h;
-    }
-
     void reset() {
         data = {};
     }