diff --git a/changelog.txt b/changelog.txt index 4f67e3ab..ac189cfc 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,6 @@ ---version 2.0.3 yet to be released--- -19-oct-2008 - shinydoofy - toggle skipping of lag frames for SDL build, default hotkey F6 +19-oct-2008 - shinydoofy - toggle lag frame counter for SDL, default hotkey F8 +19-oct-2008 - shinydoofy - toggle skipping of lag frames for SDL, default hotkey F6 19-oct-2008 - shinydoofy - [ 2179829 ] user ability to toggle "bind savestates to movie" added for SDL, default hotkey F2 19-oct-2008 - adelikat - winew - added a toggle for binding savestates to movies 18-oct-2008 - adelikat - Win32 - added -cfg (config file) command line argument diff --git a/src/drivers/sdl/config.cpp b/src/drivers/sdl/config.cpp index f6bda0f0..6b0e952a 100644 --- a/src/drivers/sdl/config.cpp +++ b/src/drivers/sdl/config.cpp @@ -282,6 +282,7 @@ InitConfig() config->addOption(prefix + "Power", 0); config->addOption(prefix + "BindState", SDLK_F2); config->addOption(prefix + "FrameAdvanceLagSkip", SDLK_F6); + config->addOption(prefix + "LagCounterDisplay", SDLK_F8); diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp index e8ba6479..357f050e 100644 --- a/src/drivers/sdl/input.cpp +++ b/src/drivers/sdl/input.cpp @@ -40,7 +40,7 @@ /** GLOBALS **/ int NoWaiting=1; extern Config *g_config; -extern bool bindSavestate, frameAdvanceLagSkip; +extern bool bindSavestate, frameAdvanceLagSkip, lagCounterDisplay; /* UsrInputType[] is user-specified. InputType[] is current @@ -390,6 +390,11 @@ KeyboardCommands() FCEUI_DispMessage("Skipping lag in Frame Advance %sabled.", frameAdvanceLagSkip ? "en" : "dis"); } + + g_config->getOption("SDL.Hotkeys.LagCounterDisplay", &key); + if(_keyonly(key)) { + lagCounterDisplay ^= 1; + } // VS Unisystem games if(gametype == GIT_VSUNI) { diff --git a/src/fceu.cpp b/src/fceu.cpp index e068d5c2..63bcec92 100644 --- a/src/fceu.cpp +++ b/src/fceu.cpp @@ -65,7 +65,7 @@ int AFon = 1, AFoff = 1, AutoFireOffset = 0; //For keeping track of autofire settings bool justLagged = false; bool frameAdvanceLagSkip = false; //If this is true, frame advance will skip over lag frame (i.e. it will emulate 2 frames instead of 1) - //TODO: SDL version - hotkey item only, but no default mapping + FCEUGI::FCEUGI() : filename(0) , archiveFilename(0)