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

Add Hard Reset menu item (enabled conditionally per core) and hotkey

This commit is contained in:
adelikat 2012-09-16 17:10:33 +00:00
parent a87a9c1cd5
commit 5d4b5e71c6
5 changed files with 740 additions and 708 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.MultiClient/Config.cs
View File

@ -468,6 +468,7 @@ namespace BizHawk.MultiClient
public string ToggleBackgroundInput = "";
public string IncreaseSpeedBinding = "Equals";
public string DecreaseSpeedBinding = "Minus";
public string HardResetBinding = "";
public string RebootCoreResetBinding = "Ctrl+R";
public string FastForwardBinding = "Tab, J1 B6";
public string RewindBinding = "Shift+R, J1 B5";

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

@ -1493,6 +1493,7 @@ namespace BizHawk.MultiClient
pauseToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.EmulatorPauseBinding;
rebootCoreToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.RebootCoreResetBinding;
resetToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SoftResetBinding;
hardResetToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HardResetBinding;
}
private void pCEToolStripMenuItem_DropDownOpened(object sender, EventArgs e)

10
BizHawk.MultiClient/MainForm.cs
View File

@ -584,7 +584,7 @@ namespace BizHawk.MultiClient
"Play Movie", "Record Movie", "Stop Movie", "Play Beginning", "Volume Up", "Volume Down", "Toggle MultiTrack", "Record All", "Record None", "Increment Player",
"Soft Reset", "Decrement Player", "Record AVI/WAV", "Stop AVI/WAV", "Toggle Menu", "Increase Speed", "Decrease Speed", "Toggle Background Input",
"Autohold", "Clear Autohold", "SNES Toggle BG 1", "SNES Toggle BG 2", "SNES Toggle BG 3", "SNES Toggle BG 4", "SNES Toggle OBJ 1", "SNES Toggle OBJ 2", "SNES Toggle OBJ 3",
"SNES Toggle OBJ 4" }
"SNES Toggle OBJ 4", "Reboot Core" }
};
private void InitControls()
@ -605,7 +605,8 @@ namespace BizHawk.MultiClient
controls.BindMulti("DecreaseWindowSize", Global.Config.DecreaseWindowSize);
controls.BindMulti("Fast Forward", Global.Config.FastForwardBinding);
controls.BindMulti("Rewind", Global.Config.RewindBinding);
controls.BindMulti("Hard Reset", Global.Config.RebootCoreResetBinding);
controls.BindMulti("Hard Reset", Global.Config.HardResetBinding);
controls.BindMulti("Reboot Core", Global.Config.RebootCoreResetBinding);
controls.BindMulti("Emulator Pause", Global.Config.EmulatorPauseBinding);
controls.BindMulti("Frame Advance", Global.Config.FrameAdvanceBinding);
controls.BindMulti("Increase Speed", Global.Config.IncreaseSpeedBinding);
@ -1833,7 +1834,7 @@ namespace BizHawk.MultiClient
Global.OSD.AddMessage("Unthrottled: " + unthrottled);
break;
case "Hard Reset":
case "Reboot Core":
{
bool autoSaveState = Global.Config.AutoSavestates;
Global.Config.AutoSavestates = false;
@ -1842,6 +1843,9 @@ namespace BizHawk.MultiClient
break;
}
case "Hard Reset":
HardReset();
break;
case "Screenshot":
TakeScreenshot();
break;

1430
BizHawk.MultiClient/config/HotkeyWindow.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

6
BizHawk.MultiClient/config/HotkeyWindow.cs
View File

@ -17,7 +17,8 @@ namespace BizHawk.MultiClient.tools
IDW_FRAMEADVANCE.SetBindings(Global.Config.FrameAdvanceBinding);
IDW_PAUSE.SetBindings(Global.Config.EmulatorPauseBinding);
IDW_HARDRESET.SetBindings(Global.Config.RebootCoreResetBinding);
IDW_REBOOTCORE.SetBindings(Global.Config.RebootCoreResetBinding);
IDW_HARDRESET.SetBindings(Global.Config.HardResetBinding);
IDW_REWIND.SetBindings(Global.Config.RewindBinding);
IDW_UNTHROTTLE.SetBindings(Global.Config.TurboBinding);
IDW_MAXTURBO.SetBindings(Global.Config.MaxTurboBinding);
@ -132,7 +133,8 @@ namespace BizHawk.MultiClient.tools
Global.Config.FastForwardBinding = IDW_FASTFORWARD.Text;
Global.Config.FrameAdvanceBinding = IDW_FRAMEADVANCE.Text;
Global.Config.RebootCoreResetBinding = IDW_HARDRESET.Text;
Global.Config.RebootCoreResetBinding = IDW_REBOOTCORE.Text;
Global.Config.HardResetBinding = IDW_HARDRESET.Text;
Global.Config.RewindBinding = IDW_REWIND.Text;
Global.Config.TurboBinding = IDW_UNTHROTTLE.Text;
Global.Config.MaxTurboBinding = IDW_MAXTURBO.Text;