diff --git a/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs b/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs index 2a67e5bd12..2c0be33265 100644 --- a/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs +++ b/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs @@ -248,7 +248,7 @@ namespace BizHawk.Client.EmuHawk CoreTree.EndUpdate(); } - public void Restart() + public override void Restart() { var ci = new CoreInfo(Emulator); KnownCores[ci.CoreName] = ci; diff --git a/src/BizHawk.Client.EmuHawk/LogWindow.cs b/src/BizHawk.Client.EmuHawk/LogWindow.cs index 446409f020..486110c9da 100644 --- a/src/BizHawk.Client.EmuHawk/LogWindow.cs +++ b/src/BizHawk.Client.EmuHawk/LogWindow.cs @@ -42,8 +42,6 @@ namespace BizHawk.Client.EmuHawk Attach(); } - public void Restart() { } - private void Attach() { _logStream = new LogStream(); diff --git a/src/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.cs b/src/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.cs index 0f536ee873..5bc3177954 100644 --- a/src/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.cs @@ -5,7 +5,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - public partial class NESSoundConfig : ToolFormBase, IToolForm + public partial class NESSoundConfig : ToolFormBase { [RequiredService] private NES NES { get; set; } @@ -13,7 +13,7 @@ namespace BizHawk.Client.EmuHawk private NES.NESSettings _oldSettings; private NES.NESSettings _settings; - public void Restart() + public override void Restart() { NESSoundConfig_Load(null, null); } diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs index e2f879a2fa..b89a2bb6c6 100644 --- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs +++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs @@ -264,7 +264,7 @@ namespace BizHawk.Client.EmuHawk protected override void UpdateBefore() => Update(fast: false); protected override void FastUpdateBefore() => Update(fast: true); - public void Restart() + public override void Restart() { if (_currentDomain == null || MemoryDomains.Contains(_currentDomain)) diff --git a/src/BizHawk.Client.EmuHawk/tools/CDL.cs b/src/BizHawk.Client.EmuHawk/tools/CDL.cs index eb62aed46c..b3280024ff 100644 --- a/src/BizHawk.Client.EmuHawk/tools/CDL.cs +++ b/src/BizHawk.Client.EmuHawk/tools/CDL.cs @@ -113,7 +113,7 @@ namespace BizHawk.Client.EmuHawk protected override void UpdateAfter() => UpdateDisplay(false); - public void Restart() + public override void Restart() { //don't try to recover the current CDL! //even though it seems like it might be nice, it might get mixed up between games. even if we use CheckCDL. Switching games with the same memory map will be bad. diff --git a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index 0723b3eb5c..fdf5138572 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -76,7 +76,7 @@ namespace BizHawk.Client.EmuHawk [ConfigPersist] public CheatsSettings Settings { get; set; } - public void Restart() + public override void Restart() { CheatEditor.MemoryDomains = Core; CheatEditor.Restart(); diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs index ae7efecf9f..52d48379d4 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs @@ -134,7 +134,7 @@ namespace BizHawk.Client.EmuHawk BreakPointControl1.UpdateValues(); } - public void Restart() + public override void Restart() { DisengageDebugger(); EngageDebugger(); diff --git a/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs b/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs index 8921ca2cbd..8e1742ccd2 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs @@ -81,7 +81,7 @@ namespace BizHawk.Client.EmuHawk Spriteback = Color.Lime; // will be overridden from config after construct } - public void Restart() + public override void Restart() { _cgb = Gb.IsCGBMode(); _lcdc = 0; diff --git a/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs b/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs index a15505eedd..2cd8db501d 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs @@ -55,7 +55,7 @@ namespace BizHawk.Client.EmuHawk Gb?.SetPrinterCallback(null); } - public void Restart() + public override void Restart() { // Really, there's not necessarily a reason to clear it at all, // since the paper would still be there, diff --git a/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs b/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs index 6faccfeb6f..a6c3e91f65 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs @@ -697,7 +697,7 @@ namespace BizHawk.Client.EmuHawk } } - public void Restart() + public override void Restart() { var mem = GBA.GetMemoryAreas(); _vram = mem.vram; diff --git a/src/BizHawk.Client.EmuHawk/tools/GameShark.cs b/src/BizHawk.Client.EmuHawk/tools/GameShark.cs index a259a2533a..cf51ca10a7 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GameShark.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GameShark.cs @@ -30,10 +30,6 @@ namespace BizHawk.Client.EmuHawk Icon = Properties.Resources.SharkIcon; } - public void Restart() - { - } - private void Go_Click(object sender, EventArgs e) { foreach (var l in txtCheat.Lines) diff --git a/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs b/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs index 1b48a99e60..2b27b95659 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs @@ -143,7 +143,7 @@ namespace BizHawk.Client.EmuHawk } } - public void Restart() + public override void Restart() { GeneralUpdate(); } diff --git a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs index 18ade913e5..26d6bfbfd9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs +++ b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs @@ -183,7 +183,7 @@ namespace BizHawk.Client.EmuHawk AddressLabel.Text = GenerateAddressString(); } - public void Restart() + public override void Restart() { if (!(MainForm.CurrentlyOpenRomArgs.OpenAdvanced is OpenAdvanced_MAME)) { diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs index 43756b99bb..3eedd63408 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs @@ -205,7 +205,7 @@ namespace BizHawk.Client.EmuHawk Settings.SplitDistance = splitContainer1.SplitterDistance; } - public void Restart() + public override void Restart() { var runningScripts = new List(); diff --git a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs index a6938f649f..ad69b97f36 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs @@ -78,7 +78,7 @@ namespace BizHawk.Client.EmuHawk } } - public void Restart() + public override void Restart() { if (_initializing) { diff --git a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs index fa9c0517e3..d6f949dd9a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs +++ b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs @@ -32,7 +32,7 @@ namespace BizHawk.Client.EmuHawk private void MultiGameCreator_Load(object sender, EventArgs e) => Restart(); - public void Restart() + public override void Restart() { FileSelectorPanel.Controls.Clear(); AddButton_Click(null, null); diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs b/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs index 9b8a881ddc..482eb2384b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs @@ -5,7 +5,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - public partial class BarcodeEntry : ToolFormBase, IToolForm + public partial class BarcodeEntry : ToolFormBase { [RequiredService] private DatachBarcode Reader { get; set; } @@ -18,7 +18,7 @@ namespace BizHawk.Client.EmuHawk Icon = Properties.Resources.NesControllerIcon; } - public void Restart() + public override void Restart() { textBox1_TextChanged(null, null); } diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs index f86babd9df..467a07bf11 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs @@ -29,10 +29,6 @@ namespace BizHawk.Client.EmuHawk SyncContents(); } - public void Restart() - { - } - private bool _isRunning; // http://www.phy.mtu.edu/~suits/notefreqs.html diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs index 31ca9c4abf..373addc3b0 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs @@ -40,7 +40,7 @@ namespace BizHawk.Client.EmuHawk Generate(true); } - public void Restart() + public override void Restart() { Generate(true); } diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs index 30b1b13536..b7546c4ece 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs @@ -65,7 +65,7 @@ namespace BizHawk.Client.EmuHawk _ppu.InstallCallback2(() => Generate(), _scanline); } - public void Restart() + public override void Restart() { Generate(true); ChrRomViewReload(); diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs index b76dd940a1..2aebee58ff 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs @@ -86,11 +86,6 @@ namespace BizHawk.Client.EmuHawk }); } - public void Restart() - { - // Nothing to do - } - protected override void UpdateBefore() => Generate(); private void FileSubMenu_DropDownOpened(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs index 2b6d8f7aaa..b06cc8c9af 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs @@ -163,10 +163,6 @@ namespace BizHawk.Client.EmuHawk private readonly List _psgEntries = new List(); private readonly Dictionary _psgEntryTable = new Dictionary(); - public void Restart() - { - } - // 32*16 samples, 16bit, mono, 8khz (but we'll change the sample rate) private static readonly byte[] EmptyWav = { 0x52, 0x49, 0x46, 0x46, 0x24, 0x04, 0x00, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6D, 0x74, 0x20, diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs index f379de7a6e..bfd6342d32 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs @@ -143,7 +143,7 @@ namespace BizHawk.Client.EmuHawk bmp.UnlockBits(lockData); } - public void Restart() + public override void Restart() { if (Viewer.IsSgx) { diff --git a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs index 369a9461ea..e9616e1367 100644 --- a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs @@ -153,7 +153,7 @@ namespace BizHawk.Client.EmuHawk } } - public void Restart() + public override void Restart() { GeneralUpdate(); } diff --git a/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs b/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs index 2bc05c8cf3..042bf03784 100644 --- a/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs +++ b/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs @@ -52,11 +52,6 @@ namespace BizHawk.Client.EmuHawk [ConfigPersist] public int UserBackdropColor { get; set; } - - public void Restart() - { - } - protected override string WindowTitleStatic => "Graphics Debugger"; public SNESGraphicsDebugger() diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs index f94fee7044..ad15853fed 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs @@ -63,7 +63,7 @@ namespace BizHawk.Client.EmuHawk RefreshDialog(refreshNeeded, refreshBranches: false); } - public void Restart() + public override void Restart() { if (!IsHandleCreated || IsDisposed) { diff --git a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs index 6b5cd27f02..58f6c01d28 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs @@ -40,11 +40,6 @@ namespace BizHawk.Client.EmuHawk InputManager.ClickyVirtualPadController.Click(name); } - public void Restart() - { - // Do nothing - } - private void SetToolTips() { // Set button hotkey mapping into tooltips diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs index a52686b497..68fa869ba9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs +++ b/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs @@ -10,7 +10,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - public partial class ToolBox : ToolFormBase, IToolForm + public partial class ToolBox : ToolFormBase { [RequiredService] private IEmulator Emulator { get; set; } @@ -31,7 +31,7 @@ namespace BizHawk.Client.EmuHawk ); } - public void Restart() + public override void Restart() { SetTools(); SetSize(); diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs b/src/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs index 59aa5a55b6..370ed546e3 100644 --- a/src/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs +++ b/src/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs @@ -9,7 +9,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - public class ToolFormBase : FormBase + public class ToolFormBase : FormBase, IToolForm { public ToolManager Tools { get; set; } @@ -21,6 +21,8 @@ namespace BizHawk.Client.EmuHawk public virtual bool AskSaveChanges() => true; + public virtual void Restart() {} + public virtual void UpdateValues(ToolFormUpdateType type) { switch (type) diff --git a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs index b905b1b3ec..04a73ea466 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs @@ -197,7 +197,7 @@ namespace BizHawk.Client.EmuHawk } } - public void Restart() + public override void Restart() { CloseFile(); ClearList(); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs index 32b2a2230e..d7ad6dc2ac 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs @@ -128,7 +128,7 @@ namespace BizHawk.Client.EmuHawk } } - public void Restart() + public override void Restart() { if (!IsHandleCreated || IsDisposed) { diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index 06bb248ec0..ed6102543e 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -306,7 +306,7 @@ namespace BizHawk.Client.EmuHawk } } - public void Restart() + public override void Restart() { _settings = new SearchEngineSettings(MemoryDomains); _searches = new RamSearchEngine(_settings, MemoryDomains); diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index 78dcf7ec2b..9ce0a7ffdc 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -236,7 +236,7 @@ namespace BizHawk.Client.EmuHawk } } - public void Restart() + public override void Restart() { if ((!IsHandleCreated || IsDisposed) && !Config.DisplayRamWatch) {