Fix comments, update changelog

This commit is contained in:
simon.kagstrom 2009-05-22 08:31:49 +00:00
parent eb9b099927
commit fbfdecc2a5
2 changed files with 6 additions and 2 deletions

View File

@ -1,4 +1,6 @@
version 2: version 2:
* Fix save/restore state
* Add virtual keyboard (for binding joystick buttons to keyboard keys) * 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 * Load a uaerc.user if it exists. This is also saved when configuration changes and it

View File

@ -319,7 +319,7 @@ static void keyboard_options(void)
keyboard_messages, submenus); keyboard_messages, submenus);
if (opt < 0) if (opt < 0)
return; return;
/* Translate key to keycode */ /* Translate key to UAE key event name */
key = virtkbd_get_key(); key = virtkbd_get_key();
if (key == NULL) if (key == NULL)
return; return;
@ -342,6 +342,8 @@ static void keyboard_options(void)
insert_keyboard_map(key, "input.1.joystick.%d.button.%d", i, sdl_key); 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.6", i);
insert_keyboard_map("SPC_ENTERGUI", "input.1.joystick.%d.button.19", 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); strcpy(savestate_fname, name);
savestate_state = STATE_DORESTORE; savestate_state = STATE_DORESTORE;
} }
else else /* Delete saved state */
unlink(name); unlink(name);
free((void*)name); free((void*)name);
} break; } break;