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

fixed gcc compile error and made hotkeys consistant with docs 

[[Split portion of a mixed commit.]]
This commit is contained in:
punkrockguy318 2008-12-01 00:37:40 +00:00
parent 5d652dc6c0
commit 6daefb7c46
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.txt
View File

@ -1,4 +1,6 @@
---version 2.0.4 yet to be released---
30-nov-2008 - punkrockguy - fixed gcc compile error
30-nov-2008 - punkrockguy - moved around some hotkeys to be consistent with docs
30-nov-2008 - punkrockguy - major update to sdl documentation
24-nov-2008 - qfox - win32 - fixed two position checks for memwatch and debugger that could cause these windows to "disappear" (moved far out of reach).
24-nov-2008 - adelikat - win32 - right click context menus installed

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

@ -273,23 +273,28 @@ InitConfig()
// Hotkeys
prefix = "SDL.Hotkeys.";
config->addOption(prefix + "CheatMenu", SDLK_F1);
config->addOption(prefix + "BindState", SDLK_F2);
#ifdef _S9XLUA_H
config->addOption(prefix + "LoadLua", SDLK_F3);
#endif
config->addOption(prefix + "RenderBG", SDLK_F4);
config->addOption(prefix + "SaveState", SDLK_F5);
config->addOption(prefix + "FrameAdvanceLagSkip", SDLK_F6);
config->addOption(prefix + "LoadState", SDLK_F7);
config->addOption(prefix + "Reset", SDLK_F9);
config->addOption(prefix + "LagCounterDisplay", SDLK_F8);
config->addOption(prefix + "MovieToggleFrameDisplay", SDLK_F9);
config->addOption(prefix + "SubtitleDisplay", SDLK_F10);
config->addOption(prefix + "Reset", SDLK_F11);
config->addOption(prefix + "Screenshot", SDLK_F12);
config->addOption(prefix + "Pause", SDLK_PAUSE);
config->addOption(prefix + "DecreaseSpeed", SDLK_MINUS);
config->addOption(prefix + "IncreaseSpeed", SDLK_EQUALS);
config->addOption(prefix + "FrameAdvance", SDLK_BACKSLASH);
config->addOption(prefix + "Power", 0);
config->addOption(prefix + "BindState", SDLK_F2);
config->addOption(prefix + "FrameAdvanceLagSkip", SDLK_F6);
config->addOption(prefix + "LagCounterDisplay", SDLK_F8);
config->addOption(prefix + "SubtitleDisplay", SDLK_F10);
//config->addOption(prefix + "Power", 0);
config->addOption(prefix + "SelectState0", SDLK_0);
config->addOption(prefix + "SelectState1", SDLK_1);
config->addOption(prefix + "SelectState2", SDLK_2);
@ -300,7 +305,7 @@ InitConfig()
config->addOption(prefix + "SelectState7", SDLK_7);
config->addOption(prefix + "SelectState8", SDLK_8);
config->addOption(prefix + "SelectState9", SDLK_9);
config->addOption(prefix + "MovieToggleFrameDisplay", SDLK_BACKSPACE);
// All mouse devices

2
src/movie.cpp
View File

@ -6,6 +6,8 @@
#include <iomanip>
#include <fstream>
#include <limits.h>
#include <stdarg.h>
#include "types.h"
#include "utils/endian.h"