turbo should bypass the 240fps cap (as opposed to fast forward)

This commit is contained in:
adelikat 2013-10-12 03:10:05 +00:00
parent 599a22bb25
commit a2d787efa4
1 changed files with 12 additions and 1 deletions

View File

@ -596,7 +596,8 @@ namespace BizHawk.MultiClient
void SyncThrottle() void SyncThrottle()
{ {
bool fastforward = Global.ClientControls["Fast Forward"] || FastForward || Global.ClientControls["Turbo"]; bool fastforward = Global.ClientControls["Fast Forward"] || FastForward;
bool superfastforward = Global.ClientControls["Turbo"];
Global.ForceNoThrottle = unthrottled || fastforward; Global.ForceNoThrottle = unthrottled || fastforward;
// realtime throttle is never going to be so exact that using a double here is wrong // realtime throttle is never going to be so exact that using a double here is wrong
@ -604,10 +605,20 @@ namespace BizHawk.MultiClient
throttle.signal_paused = EmulatorPaused || Global.Emulator is NullEmulator; throttle.signal_paused = EmulatorPaused || Global.Emulator is NullEmulator;
throttle.signal_unthrottle = unthrottled; throttle.signal_unthrottle = unthrottled;
if (fastforward) if (fastforward)
{
throttle.SetSpeedPercent(Global.Config.SpeedPercentAlternate); throttle.SetSpeedPercent(Global.Config.SpeedPercentAlternate);
}
else if (superfastforward)
{
throttle.SetSpeedPercent(int.MaxValue);
}
else else
{
throttle.SetSpeedPercent(Global.Config.SpeedPercent); throttle.SetSpeedPercent(Global.Config.SpeedPercent);
}
} }
void SetSpeedPercentAlternate(int value) void SetSpeedPercentAlternate(int value)