diff --git a/src/lua-engine.cpp b/src/lua-engine.cpp index 16f9644d..01fd2b91 100644 --- a/src/lua-engine.cpp +++ b/src/lua-engine.cpp @@ -150,9 +150,8 @@ static void FCEU_LuaOnStop() { if (wasPaused && !FCEUI_EmulationPaused()) FCEUI_ToggleEmulationPause(); FCEUD_SetEmulationSpeed(EMUSPEED_NORMAL); //TODO: Ideally lua returns the speed to the speed the user set before running the script -#ifdef WIN32 //rather than returning it to normal, and turbo off. Perhaps some flags and a FCEUD_GetEmulationSpeed function + //rather than returning it to normal, and turbo off. Perhaps some flags and a FCEUD_GetEmulationSpeed function FCEUD_TurboOff(); //Turn off turbo -#endif } @@ -287,10 +286,9 @@ static int fceu_speedmode(lua_State *L) { //printf("new speed mode: %d\n", speedmode); if (speedmode == SPEED_NORMAL) FCEUD_SetEmulationSpeed(EMUSPEED_NORMAL); -#ifdef WIN32 - else if (speedmode == SPEED_TURBO) //adelikat: Making turbo actually use turbo in Win32. - FCEUD_TurboOn(); //In Win32, turbo and max speed are two different results. Turbo employs frame skipping and sound bypassing if mute turbo option is enabled. -#endif //This makes it faster but with frame skipping. Therefore, maximum is still a useful feature, in case the user is recording an avi or making screenshots (or something else that needs all frames) + else if (speedmode == SPEED_TURBO) //adelikat: Making turbo actually use turbo. + FCEUD_TurboOn(); //Turbo and max speed are two different results. Turbo employs frame skipping and sound bypassing if mute turbo option is enabled. + //This makes it faster but with frame skipping. Therefore, maximum is still a useful feature, in case the user is recording an avi or making screenshots (or something else that needs all frames) else FCEUD_SetEmulationSpeed(EMUSPEED_FASTEST); //TODO: Make nothrottle turn off throttle, or remove the option return 0;