From fbfdecc2a5440b2fd4f0771720ed4a4484f11785 Mon Sep 17 00:00:00 2001 From: "simon.kagstrom" Date: Fri, 22 May 2009 08:31:49 +0000 Subject: [PATCH] Fix comments, update changelog --- CHANGES.wii | 2 ++ src/gui-sdl/gui-sdl.c | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES.wii b/CHANGES.wii index d865dcc..337df4b 100644 --- a/CHANGES.wii +++ b/CHANGES.wii @@ -1,4 +1,6 @@ version 2: + * Fix save/restore state + * Add virtual keyboard (for binding joystick buttons to keyboard keys) * Load a uaerc.user if it exists. This is also saved when configuration changes and it diff --git a/src/gui-sdl/gui-sdl.c b/src/gui-sdl/gui-sdl.c index 2319d98..911f199 100644 --- a/src/gui-sdl/gui-sdl.c +++ b/src/gui-sdl/gui-sdl.c @@ -319,7 +319,7 @@ static void keyboard_options(void) keyboard_messages, submenus); if (opt < 0) return; - /* Translate key to keycode */ + /* Translate key to UAE key event name */ key = virtkbd_get_key(); if (key == NULL) return; @@ -342,6 +342,8 @@ static void keyboard_options(void) insert_keyboard_map(key, "input.1.joystick.%d.button.%d", i, sdl_key); + /* For some reason, the user uaerc removes these. The following + * lines should be removed when this is properly figured out */ insert_keyboard_map("SPC_ENTERGUI", "input.1.joystick.%d.button.6", i); insert_keyboard_map("SPC_ENTERGUI", "input.1.joystick.%d.button.19", i); @@ -457,7 +459,7 @@ static void save_load_state(int which) strcpy(savestate_fname, name); savestate_state = STATE_DORESTORE; } - else + else /* Delete saved state */ unlink(name); free((void*)name); } break;