Mercurial > repos > blastem
comparison nuklear_ui/blastem_nuklear.c @ 2299:a1c9edf44c7e
Fix a place I missed a problem from the SDL2 upgrade
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Thu, 09 Mar 2023 22:59:29 -0800 |
parents | 7e995fb948c3 |
children | 62f316b76e9a |
comparison
equal
deleted
inserted
replaced
2298:9d68799f945b | 2299:a1c9edf44c7e |
---|---|
925 char *button_key = malloc(button_key_size); | 925 char *button_key = malloc(button_key_size); |
926 memcpy(button_key, pad_key, pad_key_size); | 926 memcpy(button_key, pad_key, pad_key_size); |
927 memcpy(button_key + pad_key_size, button_base, sizeof(button_base)); | 927 memcpy(button_key + pad_key_size, button_base, sizeof(button_base)); |
928 | 928 |
929 char *final_key; | 929 char *final_key; |
930 for (int i = 0; i < SDL_CONTROLLER_BUTTON_MAX; i++) | 930 for (int i = 0; i <= SDL_CONTROLLER_BUTTON_MAX; i++) |
931 { | 931 { |
932 char *base; | 932 char *base; |
933 const char *suffix; | 933 const char *suffix; |
934 size_t base_key_len; | 934 size_t base_key_len; |
935 if ( i < SDL_CONTROLLER_BUTTON_DPAD_UP) { | 935 if ( i < SDL_CONTROLLER_BUTTON_DPAD_UP || i > SDL_CONTROLLER_BUTTON_DPAD_RIGHT) { |
936 suffix = SDL_GameControllerGetStringForButton(i); | 936 suffix = SDL_GameControllerGetStringForButton(i); |
937 base_key_len = button_key_size; | 937 base_key_len = button_key_size; |
938 base = button_key; | 938 base = button_key; |
939 | |
940 | |
941 } else { | 939 } else { |
942 static const char *dir_keys[] = {"up", "down", "left", "right"}; | 940 static const char *dir_keys[] = {"up", "down", "left", "right"}; |
943 suffix = dir_keys[i - SDL_CONTROLLER_BUTTON_DPAD_UP]; | 941 suffix = dir_keys[i - SDL_CONTROLLER_BUTTON_DPAD_UP]; |
944 base = dpad_key; | 942 base = dpad_key; |
945 base_key_len = dpad_key_size; | 943 base_key_len = dpad_key_size; |