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:
parent
5bf7b33f4a
commit
9e9b3051a8
|
@ -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];
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue