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

move Subneshawk menu to the nes submenu and enforce that you can not have quicknes=true and subneshawk=true, put "experiemental" on the menu item because while it is being officially "released" it is a very big edge case and I dont' want to confuse average TASers into thinking this is a core they should use for normal use cases

This commit is contained in:
adelikat 2019-06-17 18:22:49 -05:00
parent ef4cda38d1
commit 02a3e4ceaf
3 changed files with 3811 additions and 3802 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7584
BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

27
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1217,20 +1217,20 @@ namespace BizHawk.Client.EmuHawk
private void CoresSubMenu_DropDownOpened(object sender, EventArgs e) private void CoresSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
GBInSGBMenuItem.Checked = Global.Config.GB_AsSGB; GBInSGBMenuItem.Checked = Global.Config.GB_AsSGB;
SubNESHawkMenuItem.Checked = Global.Config.UseSubNESHawk;
allowGameDBCoreOverridesToolStripMenuItem.Checked = Global.Config.CoreForcingViaGameDB; allowGameDBCoreOverridesToolStripMenuItem.Checked = Global.Config.CoreForcingViaGameDB;
} }
private void NesCoreSubMenu_DropDownOpened(object sender, EventArgs e) private void NesCoreSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
QuicknesCoreMenuItem.Checked = Global.Config.NES_InQuickNES; QuicknesCoreMenuItem.Checked = Global.Config.NES_InQuickNES;
NesCoreMenuItem.Checked = !Global.Config.NES_InQuickNES; NesCoreMenuItem.Checked = !Global.Config.NES_InQuickNES && !Global.Config.UseSubNESHawk;
SubNesHawkMenuItem.Checked = Global.Config.UseSubNESHawk;
} }
private void NesCorePick_Click(object sender, EventArgs e) private void NesCorePick_Click(object sender, EventArgs e)
{ {
Global.Config.NES_InQuickNES ^= true; Global.Config.NES_InQuickNES ^= true;
Global.Config.UseSubNESHawk = false;
if (Emulator.SystemId == "NES") if (Emulator.SystemId == "NES")
{ {
@ -1238,6 +1238,17 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private void SubNesCorePick_Click(object sender, EventArgs e)
{
Global.Config.UseSubNESHawk = true;
Global.Config.NES_InQuickNES = false;
if (!Emulator.IsNull())
{
FlagNeedsReboot();
}
}
private void CoreSNESSubMenu_DropDownOpened(object sender, EventArgs e) private void CoreSNESSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
Coresnes9xMenuItem.Checked = Global.Config.SNES_InSnes9x; Coresnes9xMenuItem.Checked = Global.Config.SNES_InSnes9x;
@ -1311,16 +1322,6 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private void SubNESHawkMenuItem_Click(object sender, EventArgs e)
{
Global.Config.UseSubNESHawk ^= true;
if (!Emulator.IsNull())
{
FlagNeedsReboot();
}
}
private void AllowGameDBCoreOverridesToolStripMenuItem_Click(object sender, EventArgs e) private void AllowGameDBCoreOverridesToolStripMenuItem_Click(object sender, EventArgs e)
{ {
Global.Config.CoreForcingViaGameDB ^= true; Global.Config.CoreForcingViaGameDB ^= true;

2
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -4440,7 +4440,7 @@ namespace BizHawk.Client.EmuHawk
GenericCoreConfig.DoDialog(this, "PC-FX Settings"); GenericCoreConfig.DoDialog(this, "PC-FX Settings");
} }
private bool Rewind(ref bool runFrame, long currentTimestamp, out bool returnToRecording) private bool Rewind(ref bool runFrame, long currentTimestamp, out bool returnToRecording)
{ {
var isRewinding = false; var isRewinding = false;