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

This commit is contained in:
andres.delikat 2011-08-10 22:58:06 +00:00
parent 5bf7b33f4a
commit 9e9b3051a8
3 changed files with 2 additions and 4 deletions

View File

@ -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];

View File

@ -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;

View File

@ -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)