sdl: vs unisystem keys now mappable

This commit is contained in:
punkrockguy318 2010-03-03 22:55:42 +00:00
parent d7ee576c1b
commit 13439c0ee8
5 changed files with 15 additions and 11 deletions

View File

@ -31,3 +31,4 @@ TODO-SVN:
* DONE!(PAUSE) Add a key to resume normal playback when finished frameskipping
* DONE! Make GetUserInput not depend on zenity
* DONE! Fixed dpad/hat support
* DONE! Fixed VS Unisystem in SDL and make hotkeys mappable

View File

@ -1,3 +1,4 @@
03-march-2010 - prockguy - SDL - VS unisystem keys now configable
03-march-2010 - prcokguy - SDL - changed default hotkeys and keys to match w32
03-march-2010 - prockguy - SDL - fixed dpad/joyhat support
01-march-2010 - adelikat - Movie file format header now has a FDS flag

View File

@ -303,6 +303,8 @@ InitConfig()
SDLK_F6, // fds select
SDLK_F7, // load state
SDLK_F8, // fds eject
SDLK_F6, // VS insert coin
SDLK_F8, // VS toggle dipswitch
SDLK_PERIOD, // toggle frame display
SDLK_F10, // toggle subtitle
SDLK_F11, // reset

View File

@ -9,16 +9,20 @@ int LoadCPalette(const std::string &file);
// hotkey definitions
const int HK_MAX = 33;
enum HOTKEY { HK_CHEAT_MENU, HK_BIND_STATE, HK_LOAD_LUA, HK_TOGGLE_BG,
HK_SAVE_STATE, HK_FDS_SELECT, HK_LOAD_STATE, HK_FDS_EJECT ,
HK_VS_INSERT_COIN, HK_VS_TOGGLE_DIPSWITCH,
HK_TOGGLE_FRAME_DISPLAY, HK_TOGGLE_SUBTITLE, HK_RESET, HK_SCREENSHOT,
HK_PAUSE, HK_DECREASE_SPEED, HK_INCREASE_SPEED, HK_FRAME_ADVANCE, HK_TURBO,
HK_TOGGLE_INPUT_DISPLAY, HK_MOVIE_TOGGLE_RW, HK_MUTE_CAPTURE, HK_QUIT, HK_FA_LAG_SKIP, HK_LAG_COUNTER_DISPLAY,
HK_SELECT_STATE_0, HK_SELECT_STATE_1, HK_SELECT_STATE_2, HK_SELECT_STATE_3,
HK_SELECT_STATE_4, HK_SELECT_STATE_5, HK_SELECT_STATE_6, HK_SELECT_STATE_7,
HK_SELECT_STATE_8, HK_SELECT_STATE_9};
const int HK_MAX = 35;
static const char* HotkeyStrings[HK_MAX] = {
"CheatMenu",
"BindState",
@ -26,9 +30,10 @@ static const char* HotkeyStrings[HK_MAX] = {
"ToggleBG",
"SaveState",
"FDSSelect",
"FDSEject",
"LoadState",
"FDSEject",
"VSInsertCoin",
"VSToggleDip",
"MovieToggleFrameDisplay",
"SubtitleDisplay",
"Reset",

View File

@ -630,10 +630,10 @@ KeyboardCommands()
// VS Unisystem games
if(gametype == GIT_VSUNI) {
// insert coin
if(keyonly(F8)) FCEUI_VSUniCoin();
if(_keyonly(Hotkeys[HK_VS_INSERT_COIN])) FCEUI_VSUniCoin();
// toggle dipswitch display
if(keyonly(F6)) {
if(_keyonly(Hotkeys[HK_VS_TOGGLE_DIPSWITCH])) {
DIPS^=1;
FCEUI_VSUniToggleDIPView();
}
@ -655,16 +655,11 @@ KeyboardCommands()
if(keyonly(H)) FCEUI_NTSCSELHUE();
if(keyonly(T)) FCEUI_NTSCSELTINT();
if (_keyonly(Hotkeys[HK_DECREASE_SPEED]))
FCEUI_NTSCDEC();
if (_keyonly(Hotkeys[HK_INCREASE_SPEED]))
FCEUI_NTSCINC();
if((InputType[2] == SIFC_BWORLD) || (cspec == SIS_DATACH)) {
if(keyonly(F8)) {