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

movie subtitle toggle for SDL

This commit is contained in:
shinydoofy 2008-11-23 22:29:02 +00:00
parent ce8bcd1b83
commit 60fe20142e
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -1,4 +1,5 @@
---version 2.0.4 yet to be released--- ---version 2.0.4 yet to be released---
23-nov-2008 - shinydoofy - movie subs now have a toggle button in the SDL build (F10 by default)
23-nov-2008 - adelikat - movie subtitle system installed 23-nov-2008 - adelikat - movie subtitle system installed
22-nov-2008 - adelikat - win32 - added help menu item to TASEdit and Hex Editor, Minor TASEdit clean up 22-nov-2008 - adelikat - win32 - added help menu item to TASEdit and Hex Editor, Minor TASEdit clean up
22-nov-2008 - adelikat - win32 - fixed so that turbo works with VBlank sync settings 22-nov-2008 - adelikat - win32 - fixed so that turbo works with VBlank sync settings

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

@ -289,6 +289,7 @@ InitConfig()
config->addOption(prefix + "BindState", SDLK_F2); config->addOption(prefix + "BindState", SDLK_F2);
config->addOption(prefix + "FrameAdvanceLagSkip", SDLK_F6); config->addOption(prefix + "FrameAdvanceLagSkip", SDLK_F6);
config->addOption(prefix + "LagCounterDisplay", SDLK_F8); config->addOption(prefix + "LagCounterDisplay", SDLK_F8);
config->addOption(prefix + "SubtitleDisplay", SDLK_F10);
config->addOption(prefix + "SelectState0", SDLK_0); config->addOption(prefix + "SelectState0", SDLK_0);
config->addOption(prefix + "SelectState1", SDLK_1); config->addOption(prefix + "SelectState1", SDLK_1);
config->addOption(prefix + "SelectState2", SDLK_2); config->addOption(prefix + "SelectState2", SDLK_2);

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

@ -166,6 +166,7 @@ int quitKey;
int stateKey[10]; int stateKey[10];
int movieToggleFrameDisplayKey; int movieToggleFrameDisplayKey;
int lagCounterDisplayKey; int lagCounterDisplayKey;
int SubtitleDisplayKey;
// this function loads the sdl hotkeys from the config file into the // this function loads the sdl hotkeys from the config file into the
// global scope. this elimates the need for accessing the config file // global scope. this elimates the need for accessing the config file
@ -201,6 +202,7 @@ void setHotKeys()
g_config->getOption("SDL.Hotkeys.SelectState9", &stateKey[9]); g_config->getOption("SDL.Hotkeys.SelectState9", &stateKey[9]);
g_config->getOption("SDL.Hotkeys.LagCounterDisplay", &lagCounterDisplayKey); g_config->getOption("SDL.Hotkeys.LagCounterDisplay", &lagCounterDisplayKey);
g_config->getOption("SDL.Hotkeys.MovieToggleFrameDisplay", &movieToggleFrameDisplayKey); g_config->getOption("SDL.Hotkeys.MovieToggleFrameDisplay", &movieToggleFrameDisplayKey);
g_config->getOption("SDL.Hotkeys.SubtitleDisplay", &SubtitleDisplayKey);
/* /*
config->addOption(prefix + "FrameAdvance", SDLK_BACKSLASH); config->addOption(prefix + "FrameAdvance", SDLK_BACKSLASH);
config->addOption(prefix + "Power", 0); config->addOption(prefix + "Power", 0);
@ -459,6 +461,13 @@ KeyboardCommands()
if(_keyonly(lagCounterDisplayKey)) { if(_keyonly(lagCounterDisplayKey)) {
lagCounterDisplay ^= 1; lagCounterDisplay ^= 1;
} }
if (_keyonly(SubtitleDisplayKey)) {
extern int movieSubtitles;
movieSubtitles ^= 1;
FCEUI_DispMessage("Movie subtitles o%s.",
movieSubtitles ? "n" : "ff");
}
// VS Unisystem games // VS Unisystem games
if(gametype == GIT_VSUNI) { if(gametype == GIT_VSUNI) {