Add `LoadedCoreIsNesHawkInVSMode` helper prop in `MainForm`
This commit is contained in:
parent
f21c8b914c
commit
2321bc55e6
|
@ -89,6 +89,10 @@ namespace BizHawk.Client.EmuHawk
|
||||||
AppendAllFilesEntry = false,
|
AppendAllFilesEntry = false,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/// <remarks>should this not be a separate sysID? --yoshi</remarks>
|
||||||
|
private bool LoadedCoreIsNesHawkInVSMode
|
||||||
|
=> Emulator is NES { IsVS: true } or SubNESHawk { IsVs: true };
|
||||||
|
|
||||||
private void FileSubMenu_DropDownOpened(object sender, EventArgs e)
|
private void FileSubMenu_DropDownOpened(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
SaveStateSubMenu.Enabled =
|
SaveStateSubMenu.Enabled =
|
||||||
|
@ -1254,12 +1258,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
{
|
{
|
||||||
var boardName = Emulator.HasBoardInfo() ? Emulator.AsBoardInfo().BoardName : null;
|
var boardName = Emulator.HasBoardInfo() ? Emulator.AsBoardInfo().BoardName : null;
|
||||||
FDSControlsMenuItem.Enabled = boardName == "FDS";
|
FDSControlsMenuItem.Enabled = boardName == "FDS";
|
||||||
|
VSControlsMenuItem.Enabled = VSSettingsMenuItem.Enabled = LoadedCoreIsNesHawkInVSMode;
|
||||||
VSControlsMenuItem.Enabled =
|
|
||||||
VSSettingsMenuItem.Enabled =
|
|
||||||
(Emulator is NES nes && nes.IsVS)
|
|
||||||
|| (Emulator is SubNESHawk sub && sub.IsVs);
|
|
||||||
|
|
||||||
NESSoundChannelsMenuItem.Enabled = Tools.IsAvailable<NESSoundConfig>();
|
NESSoundChannelsMenuItem.Enabled = Tools.IsAvailable<NESSoundConfig>();
|
||||||
MovieSettingsMenuItem.Enabled = Emulator is NES or SubNESHawk && MovieSession.Movie.NotActive();
|
MovieSettingsMenuItem.Enabled = Emulator is NES or SubNESHawk && MovieSession.Movie.NotActive();
|
||||||
|
|
||||||
|
@ -1358,8 +1357,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
|
|
||||||
private void VsInsertCoinP1MenuItem_Click(object sender, EventArgs e)
|
private void VsInsertCoinP1MenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (Emulator is NES nes && nes.IsVS
|
if (LoadedCoreIsNesHawkInVSMode)
|
||||||
|| Emulator is SubNESHawk sub && sub.IsVs)
|
|
||||||
{
|
{
|
||||||
if (!MovieSession.Movie.IsPlaying())
|
if (!MovieSession.Movie.IsPlaying())
|
||||||
{
|
{
|
||||||
|
@ -1371,8 +1369,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
|
|
||||||
private void VsInsertCoinP2MenuItem_Click(object sender, EventArgs e)
|
private void VsInsertCoinP2MenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (Emulator is NES nes && nes.IsVS
|
if (LoadedCoreIsNesHawkInVSMode)
|
||||||
|| Emulator is SubNESHawk sub && sub.IsVs)
|
|
||||||
{
|
{
|
||||||
if (!MovieSession.Movie.IsPlaying())
|
if (!MovieSession.Movie.IsPlaying())
|
||||||
{
|
{
|
||||||
|
@ -1384,8 +1381,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
|
|
||||||
private void VsServiceSwitchMenuItem_Click(object sender, EventArgs e)
|
private void VsServiceSwitchMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (Emulator is NES nes && nes.IsVS
|
if (LoadedCoreIsNesHawkInVSMode)
|
||||||
|| Emulator is SubNESHawk sub && sub.IsVs)
|
|
||||||
{
|
{
|
||||||
if (!MovieSession.Movie.IsPlaying())
|
if (!MovieSession.Movie.IsPlaying())
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue