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

Deduplicate some code in `MainForm`

This commit is contained in:
YoshiRulz 2022-09-11 14:30:25 +10:00
parent 728f393eb1
commit 3cbdd36fe0
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -414,11 +414,17 @@ namespace BizHawk.Client.EmuHawk
}
private void SaveToCurrentSlotMenuItem_Click(object sender, EventArgs e)
=> SavestateCurrentSlot();
private void SavestateCurrentSlot()
{
SaveQuickSave($"QuickSave{Config.SaveSlot}");
}
private void LoadCurrentSlotMenuItem_Click(object sender, EventArgs e)
=> LoadstateCurrentSlot();
private void LoadstateCurrentSlot()
{
LoadQuickSave($"QuickSave{Config.SaveSlot}");
}
@ -645,9 +651,12 @@ namespace BizHawk.Client.EmuHawk
}
}
private void ScheduleShutdown()
=> _exitRequestPending = true;
public void CloseEmulator(int? exitCode = null)
{
_exitRequestPending = true;
ScheduleShutdown();
if (exitCode != null) _exitCode = exitCode.Value;
}
@ -1094,6 +1103,9 @@ namespace BizHawk.Client.EmuHawk
}
private void UnthrottledMenuItem_Click(object sender, EventArgs e)
=> ToggleUnthrottled();
private void ToggleUnthrottled()
{
Config.Unthrottled ^= true;
ThrottleMessage();
@ -2445,6 +2457,9 @@ namespace BizHawk.Client.EmuHawk
}
private void LoadLastRomContextMenuItem_Click(object sender, EventArgs e)
=> LoadMostRecentROM();
private void LoadMostRecentROM()
{
LoadRomFromRecent(Config.RecentRoms.MostRecent);
}

11
src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
View File

@ -54,8 +54,7 @@ namespace BizHawk.Client.EmuHawk
FrameInch = true;
return false;
case "Toggle Throttle":
Config.Unthrottled ^= true;
ThrottleMessage();
ToggleUnthrottled();
break;
case "Soft Reset":
SoftReset();
@ -64,10 +63,10 @@ namespace BizHawk.Client.EmuHawk
HardReset();
break;
case "Quick Load":
LoadQuickSave($"QuickSave{Config.SaveSlot}");
LoadstateCurrentSlot();
break;
case "Quick Save":
SaveQuickSave($"QuickSave{Config.SaveSlot}");
SavestateCurrentSlot();
break;
case "Clear Autohold":
ClearAutohold();
@ -93,7 +92,7 @@ namespace BizHawk.Client.EmuHawk
CloseRom();
break;
case "Load Last ROM":
LoadRomFromRecent(Config.RecentRoms.MostRecent);
LoadMostRecentROM();
break;
case "Flush SaveRAM":
FlushSaveRAM();
@ -126,7 +125,7 @@ namespace BizHawk.Client.EmuHawk
ToggleSound();
break;
case "Exit Program":
_exitRequestPending = true;
ScheduleShutdown();
break;
case "Record A/V":
RecordAv();

13
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -556,7 +556,7 @@ namespace BizHawk.Client.EmuHawk
}
else if (Config.RecentRoms.AutoLoad && !Config.RecentRoms.Empty)
{
LoadRomFromRecent(Config.RecentRoms.MostRecent);
LoadMostRecentROM();
}
if (_argParser.audiosync.HasValue)
@ -637,7 +637,7 @@ namespace BizHawk.Client.EmuHawk
}
else if (Config.AutoLoadLastSaveSlot)
{
LoadQuickSave($"QuickSave{Config.SaveSlot}");
LoadstateCurrentSlot();
}
}
@ -3608,10 +3608,7 @@ namespace BizHawk.Client.EmuHawk
if (_autoDumpLength == 0) // finish
{
StopAv();
if (_argParser._autoCloseOnDump)
{
_exitRequestPending = true;
}
if (_argParser._autoCloseOnDump) ScheduleShutdown();
}
}
}
@ -3949,7 +3946,7 @@ namespace BizHawk.Client.EmuHawk
Tools.UpdateCheatRelatedTools(null, null);
if (!MovieSession.NewMovieQueued && Config.AutoLoadLastSaveSlot && HasSlot(Config.SaveSlot))
{
LoadQuickSave($"QuickSave{Config.SaveSlot}");
LoadstateCurrentSlot();
}
if (FirmwareManager.RecentlyServed.Count > 0)
@ -4078,7 +4075,7 @@ namespace BizHawk.Client.EmuHawk
private void AutoSaveStateIfConfigured()
{
if (Config.AutoSaveLastSaveSlot && Emulator.HasSavestates()) SaveQuickSave($"QuickSave{Config.SaveSlot}");
if (Config.AutoSaveLastSaveSlot && Emulator.HasSavestates()) SavestateCurrentSlot();
}
public bool GameIsClosing { get; private set; } // Lets tools make better decisions when being called by CloseGame