ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/Config.cs
View File

@ -430,7 +430,7 @@
public NESControllerTemplate GameBoyAutoController = new NESControllerTemplate(); public NESControllerTemplate GameBoyAutoController = new NESControllerTemplate();
//NES settings //NES settings
public string NESReset = "Backspace"; //public string NESReset = "Backspace";
public NESControllerTemplate[] NESController = new NESControllerTemplate[4]; public NESControllerTemplate[] NESController = new NESControllerTemplate[4];
public NESControllerTemplate[] NESAutoController = new NESControllerTemplate[4]; public NESControllerTemplate[] NESAutoController = new NESControllerTemplate[4];

3
BizHawk.MultiClient/Input/ControllerBinding.cs
View File

@ -101,14 +101,12 @@ namespace BizHawk.MultiClient
public bool Autofire { get { return false; } set { autofire = value; } } public bool Autofire { get { return false; } set { autofire = value; } }
public int On { get; set; } public int On { get; set; }
public int Off { get; set; } public int Off { get; set; }
//public int StartFrame { get; set; }
public AutofireController(ControllerDefinition definition) public AutofireController(ControllerDefinition definition)
{ {
On = Global.Config.AutofireOn < 1 ? 0 : Global.Config.AutofireOn; On = Global.Config.AutofireOn < 1 ? 0 : Global.Config.AutofireOn;
Off = Global.Config.AutofireOff < 1 ? 0 : Global.Config.AutofireOff; Off = Global.Config.AutofireOff < 1 ? 0 : Global.Config.AutofireOff;
//StartFrame = 0;
type = definition; type = definition;
} }
@ -168,7 +166,6 @@ namespace BizHawk.MultiClient
buttons[kvp.Key] = false; buttons[kvp.Key] = false;
foreach (var bound_button in kvp.Value) foreach (var bound_button in kvp.Value)
{ {
if (controller[bound_button]) if (controller[bound_button])
{ {
buttons[kvp.Key] = true; buttons[kvp.Key] = true;

1
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -1299,6 +1299,7 @@ namespace BizHawk.MultiClient
pauseToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.EmulatorPauseBinding; pauseToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.EmulatorPauseBinding;
powerToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HardResetBinding; powerToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HardResetBinding;
resetToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SoftResetBinding;
} }
protected override void OnClosed(EventArgs e) protected override void OnClosed(EventArgs e)