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:
parent
ef4cda38d1
commit
02a3e4ceaf
File diff suppressed because it is too large
Load Diff
|
@ -1217,20 +1217,20 @@ namespace BizHawk.Client.EmuHawk
|
|||
private void CoresSubMenu_DropDownOpened(object sender, EventArgs e)
|
||||
{
|
||||
GBInSGBMenuItem.Checked = Global.Config.GB_AsSGB;
|
||||
SubNESHawkMenuItem.Checked = Global.Config.UseSubNESHawk;
|
||||
|
||||
allowGameDBCoreOverridesToolStripMenuItem.Checked = Global.Config.CoreForcingViaGameDB;
|
||||
}
|
||||
|
||||
private void NesCoreSubMenu_DropDownOpened(object sender, EventArgs e)
|
||||
{
|
||||
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)
|
||||
{
|
||||
Global.Config.NES_InQuickNES ^= true;
|
||||
Global.Config.UseSubNESHawk = false;
|
||||
|
||||
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)
|
||||
{
|
||||
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)
|
||||
{
|
||||
Global.Config.CoreForcingViaGameDB ^= true;
|
||||
|
|
|
@ -4440,7 +4440,7 @@ namespace BizHawk.Client.EmuHawk
|
|||
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;
|
||||
|
||||
|
|
Loading…
Reference in New Issue