From 9e9b3051a8033eb33d85ae7362db61309f02af2d Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Wed, 10 Aug 2011 22:58:06 +0000 Subject: [PATCH] Remove hard coded "Backspace" hotkey mapping for nes reset (the soft reset hotkey handles reset just fine). Add Reset hotkey mapping to Reset menu item --- BizHawk.MultiClient/Config.cs | 2 +- BizHawk.MultiClient/Input/ControllerBinding.cs | 3 --- BizHawk.MultiClient/MainForm.MenuItems.cs | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index a8a9601c8f..e648e50b05 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -430,7 +430,7 @@ public NESControllerTemplate GameBoyAutoController = new NESControllerTemplate(); //NES settings - public string NESReset = "Backspace"; + //public string NESReset = "Backspace"; public NESControllerTemplate[] NESController = new NESControllerTemplate[4]; public NESControllerTemplate[] NESAutoController = new NESControllerTemplate[4]; diff --git a/BizHawk.MultiClient/Input/ControllerBinding.cs b/BizHawk.MultiClient/Input/ControllerBinding.cs index 2c2c0a3a51..d518ee2baa 100644 --- a/BizHawk.MultiClient/Input/ControllerBinding.cs +++ b/BizHawk.MultiClient/Input/ControllerBinding.cs @@ -101,14 +101,12 @@ namespace BizHawk.MultiClient public bool Autofire { get { return false; } set { autofire = value; } } public int On { get; set; } public int Off { get; set; } - //public int StartFrame { get; set; } public AutofireController(ControllerDefinition definition) { On = Global.Config.AutofireOn < 1 ? 0 : Global.Config.AutofireOn; Off = Global.Config.AutofireOff < 1 ? 0 : Global.Config.AutofireOff; - //StartFrame = 0; type = definition; } @@ -168,7 +166,6 @@ namespace BizHawk.MultiClient buttons[kvp.Key] = false; foreach (var bound_button in kvp.Value) { - if (controller[bound_button]) { buttons[kvp.Key] = true; diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index 4988760aea..0aac452912 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -1299,6 +1299,7 @@ namespace BizHawk.MultiClient pauseToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.EmulatorPauseBinding; powerToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HardResetBinding; + resetToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SoftResetBinding; } protected override void OnClosed(EventArgs e)