config menu: stop exiting the category for certain items

This commit is contained in:
Maschell 2024-04-28 02:11:51 +02:00
parent 2b29db165c
commit 958ba503c8
2 changed files with 2 additions and 8 deletions

View File

@ -152,8 +152,6 @@ void ConfigUtils::displayMenu() {
baseInput.lastData = baseInput.data; baseInput.lastData = baseInput.data;
} }
baseInput.process();
WUPSConfigSimplePadData simpleData; WUPSConfigSimplePadData simpleData;
simpleData.buttons_d = convertInputs(baseInput.data.buttons_d); simpleData.buttons_d = convertInputs(baseInput.data.buttons_d);
simpleData.buttons_r = convertInputs(baseInput.data.buttons_r); simpleData.buttons_r = convertInputs(baseInput.data.buttons_r);

View File

@ -3,6 +3,8 @@
class CombinedInput : public Input { class CombinedInput : public Input {
public: public:
void combine(const Input &b) { 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; data.buttons_h |= b.data.buttons_h;
if (!data.touched) { if (!data.touched) {
data.touched = b.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() { void reset() {
data = {}; data = {};
} }