From 762048018e226ca4fdd88d030019b80dd7f7ca34 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 21 Jun 2014 20:18:14 +0000 Subject: [PATCH] If not clock throttle, Disable speed settings in the menu, and warn user when they press the increase/decrease speed hotkeys --- BizHawk.Client.EmuHawk/MainForm.Events.cs | 7 +++++++ BizHawk.Client.EmuHawk/MainForm.cs | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index 09e90f77b4..8211558416 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -719,6 +719,13 @@ namespace BizHawk.Client.EmuHawk Speed75MenuItem.Image = (Global.Config.SpeedPercentAlternate == 75) ? Properties.Resources.FastForward : null; Speed50MenuItem.Checked = Global.Config.SpeedPercent == 50; Speed50MenuItem.Image = (Global.Config.SpeedPercentAlternate == 50) ? Properties.Resources.FastForward : null; + + Speed50MenuItem.Enabled = + Speed75MenuItem.Enabled = + Speed100MenuItem.Enabled = + Speed150MenuItem.Enabled = + Speed200MenuItem.Enabled = + Global.Config.ClockThrottle; } private void KeyPriorityMenuItem_DropDownOpened(object sender, EventArgs e) diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 30af6809e8..1dae8608f7 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -2021,6 +2021,12 @@ namespace BizHawk.Client.EmuHawk private void IncreaseSpeed() { + if (!Global.Config.ClockThrottle) + { + GlobalWin.OSD.AddMessage("Unable to change speed, please switch to clock throttle"); + return; + } + var oldp = Global.Config.SpeedPercent; int newp; @@ -2082,6 +2088,12 @@ namespace BizHawk.Client.EmuHawk private void DecreaseSpeed() { + if (!Global.Config.ClockThrottle) + { + GlobalWin.OSD.AddMessage("Unable to change speed, please switch to clock throttle"); + return; + } + var oldp = Global.Config.SpeedPercent; int newp;