From c68cc14f16e9709361ecac73b217ba2588ed7990 Mon Sep 17 00:00:00 2001 From: Lino5000 Date: Mon, 30 May 2022 17:27:52 +1000 Subject: [PATCH] Fix Linux CLI keyboard input bug due to mismatched types --- desmume/src/frontend/posix/shared/ctrlssdl.cpp | 4 ++-- desmume/src/frontend/posix/shared/ctrlssdl.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/desmume/src/frontend/posix/shared/ctrlssdl.cpp b/desmume/src/frontend/posix/shared/ctrlssdl.cpp index e8d0b7154..01af0251d 100644 --- a/desmume/src/frontend/posix/shared/ctrlssdl.cpp +++ b/desmume/src/frontend/posix/shared/ctrlssdl.cpp @@ -30,7 +30,7 @@ -u16 keyboard_cfg[NB_KEYS]; +u32 keyboard_cfg[NB_KEYS]; u16 joypad_cfg[NB_KEYS]; u16 nbr_joy; mouse_status mouse; @@ -171,7 +171,7 @@ u16 lookup_joy_key (u16 keyval) { } /* Return keypad vector with given key set to 1 */ -u16 lookup_key (u16 keyval) { +u32 lookup_key (u32 keyval) { int i; u16 Key = 0; diff --git a/desmume/src/frontend/posix/shared/ctrlssdl.h b/desmume/src/frontend/posix/shared/ctrlssdl.h index 916c4d45e..41f2e3827 100644 --- a/desmume/src/frontend/posix/shared/ctrlssdl.h +++ b/desmume/src/frontend/posix/shared/ctrlssdl.h @@ -64,7 +64,7 @@ /* Keypad key names */ extern const char *key_names[NB_KEYS]; /* Current keyboard configuration */ -extern u16 keyboard_cfg[NB_KEYS]; +extern u32 keyboard_cfg[NB_KEYS]; /* Current joypad configuration */ extern u16 joypad_cfg[NB_KEYS]; /* Number of detected joypads */ @@ -103,7 +103,7 @@ u16 get_joy_key(int index); u16 get_set_joy_key(int index); void update_keypad(u16 keys); u16 get_keypad( void); -u16 lookup_key (u16 keyval); +u32 lookup_key (u32 keyval); u16 lookup_joy_key (u16 keyval); void process_ctrls_event( SDL_Event& event,