From 00d58933737a86a37f81e4e5cafae15ad4474417 Mon Sep 17 00:00:00 2001 From: Shaun Inman Date: Sun, 22 Jan 2023 21:56:29 -0500 Subject: [PATCH] removed button sort order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit will depend on core, will need to be overridden for logical sorting because the cores aren't doing it 🤦‍♂️ --- src/minarch/main.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/src/minarch/main.c b/src/minarch/main.c index c2a609c..99f0522 100644 --- a/src/minarch/main.c +++ b/src/minarch/main.c @@ -549,22 +549,6 @@ static InputOverride input_overrides[] = { {NULL,0,0}, }; -static const uint32_t button_sort_order[RETRO_BUTTON_COUNT] = { - RETRO_DEVICE_ID_JOYPAD_UP, - RETRO_DEVICE_ID_JOYPAD_DOWN, - RETRO_DEVICE_ID_JOYPAD_LEFT, - RETRO_DEVICE_ID_JOYPAD_RIGHT, - RETRO_DEVICE_ID_JOYPAD_SELECT, - RETRO_DEVICE_ID_JOYPAD_START, - RETRO_DEVICE_ID_JOYPAD_Y, - RETRO_DEVICE_ID_JOYPAD_X, - RETRO_DEVICE_ID_JOYPAD_B, - RETRO_DEVICE_ID_JOYPAD_A, - RETRO_DEVICE_ID_JOYPAD_L, - RETRO_DEVICE_ID_JOYPAD_R, - RETRO_DEVICE_ID_JOYPAD_L2, - RETRO_DEVICE_ID_JOYPAD_R2, -}; static const char* core_button_names[RETRO_BUTTON_COUNT]; // core-provided static const char* device_button_names[RETRO_BUTTON_COUNT] = { [RETRO_DEVICE_ID_JOYPAD_B] = "B", @@ -699,7 +683,7 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico if (var->port || var->device!=1 || var->id>=RETRO_BUTTON_COUNT) continue; core_button_names[var->id] = var->description; - printf("%s: %s\n", var->description, device_button_names[var->id]); + // printf("%s: %s\n", var->description, device_button_names[var->id]); } // TODO: is this guaranteed to be called? @@ -715,9 +699,8 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico // TODO: with or without button_sort_order the sort order is broken for (int i=0; i