From 958ba503c8e6c56fe5ae2e228c8d008c0dcbf421 Mon Sep 17 00:00:00 2001 From: Maschell Date: Sun, 28 Apr 2024 02:11:51 +0200 Subject: [PATCH] config menu: stop exiting the category for certain items --- source/utils/config/ConfigUtils.cpp | 2 -- source/utils/input/CombinedInput.h | 8 ++------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/source/utils/config/ConfigUtils.cpp b/source/utils/config/ConfigUtils.cpp index 81c8414..7837644 100644 --- 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 index adcfe77..1bbae3b 100644 --- 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 @@ public: } } - 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 = {}; }