ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL: changed default keybindings to match w32 defaults

This commit is contained in:
punkrockguy318 2010-03-03 09:28:23 +00:00
parent 603f78e7f6
commit 70fed68de4
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
TODO-SDL
View File

@ -3,15 +3,15 @@ TODO-SVN:
* DONE! Get to compile with SDL 1.3 * DONE! Get to compile with SDL 1.3
* segfaults when opening a second game * segfaults when opening a second game
* segfaults on fullscreen entry * segfaults on fullscreen entry
* Fix sound stuttering/lag (fixed in SDL 1.1.14?) * DONE! Fix sound stuttering/lag (fixed in SDL 1.1.14)
* Flesh out GTK GUI * Flesh out GTK GUI
* Sound config * Sound config
* DONE! Individual volume mixers * DONE! Individual volume mixers
* Save config * Save config
* Should be in menus * Should be in menus
* Hotkeys * Hotkeys
* Redesign internal data structures of hotkeys * DONE! Redesign internal data structures of hotkeys
* (a bunch of global ints is ugly) * design UI
* Video config * Video config
* DONE! Windowed scale amount * DONE! Windowed scale amount
* DONE! Color / Hue / Tint * DONE! Color / Hue / Tint
@ -30,3 +30,4 @@ TODO-SVN:
* DONE! Fix Famicom Disk System * DONE! Fix Famicom Disk System
* DONE!(PAUSE) Add a key to resume normal playback when finished frameskipping * DONE!(PAUSE) Add a key to resume normal playback when finished frameskipping
* DONE! Make GetUserInput not depend on zenity * DONE! Make GetUserInput not depend on zenity
* DONE! Fixed dpad/hat support

1
changelog.txt
View File

@ -1,3 +1,4 @@
03-march-2010 - prcokguy - SDL - changed default hotkeys and keys to match w32
03-march-2010 - prockguy - SDL - fixed dpad/joyhat support 03-march-2010 - prockguy - SDL - fixed dpad/joyhat support
01-march-2010 - adelikat - Movie file format header now has a FDS flag 01-march-2010 - adelikat - Movie file format header now has a FDS flag
01-march-2010 - adelikat - win32 - cheats dialog - toggling a cheat in the cheats list now updates the active cheats count 01-march-2010 - adelikat - win32 - cheats dialog - toggling a cheat in the cheats list now updates the active cheats count

10
src/drivers/sdl/config.cpp
View File

@ -302,7 +302,7 @@ InitConfig()
SDLK_F6, // fds select SDLK_F6, // fds select
SDLK_F7, // load state SDLK_F7, // load state
SDLK_F8, // fds eject SDLK_F8, // fds eject
SDLK_F9, // toggle frame display SDLK_PERIOD, // toggle frame display
SDLK_F10, // toggle subtitle SDLK_F10, // toggle subtitle
SDLK_F11, // reset SDLK_F11, // reset
SDLK_F12, // screenshot SDLK_F12, // screenshot
@ -311,12 +311,12 @@ InitConfig()
SDLK_EQUALS, // speed-- SDLK_EQUALS, // speed--
SDLK_BACKSLASH, //frame advnace SDLK_BACKSLASH, //frame advnace
SDLK_TAB, // turbo SDLK_TAB, // turbo
SDLK_i, // toggle input display SDLK_COMMA, // toggle input display
SDLK_o, // toggle movie RW SDLK_q, // toggle movie RW
SDLK_p, // toggle mute capture SDLK_QUOTE, // toggle mute capture
0, // quit 0, // quit
SDLK_DELETE, // frame advance lag skip SDLK_DELETE, // frame advance lag skip
SDLK_ESCAPE, // lag counter display SDLK_SLASH, // lag counter display
SDLK_0, SDLK_1, SDLK_2, SDLK_3, SDLK_4, SDLK_5, SDLK_0, SDLK_1, SDLK_2, SDLK_3, SDLK_4, SDLK_5,
SDLK_6, SDLK_7, SDLK_8, SDLK_9}; SDLK_6, SDLK_7, SDLK_8, SDLK_9};

4
src/drivers/sdl/input.cpp
View File

@ -1754,8 +1754,8 @@ const char *GamePadNames[GAMEPAD_NUM_BUTTONS] =
const char *DefaultGamePadDevice[GAMEPAD_NUM_DEVICES] = const char *DefaultGamePadDevice[GAMEPAD_NUM_DEVICES] =
{"Keyboard", "None", "None", "None"}; {"Keyboard", "None", "None", "None"};
const int DefaultGamePad[GAMEPAD_NUM_DEVICES][GAMEPAD_NUM_BUTTONS] = const int DefaultGamePad[GAMEPAD_NUM_DEVICES][GAMEPAD_NUM_BUTTONS] =
{ { SDLK_j, SDLK_k, SDLK_TAB, SDLK_RETURN, { { SDLK_F, SDLK_D, SDLK_S, SDLK_RETURN,
SDLK_w, SDLK_s, SDLK_a, SDLK_d, 0, 0 }, SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, 0, 0 },
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };