From 870d7df6f2c38454bfa65ade4adad8d08cf7a5c5 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 14 Mar 2020 16:09:25 -0500 Subject: [PATCH] cleanup some unneeded code --- BizHawk.Client.EmuHawk/MainForm.Events.cs | 2 -- BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs | 2 -- .../Consoles/Nintendo/Gameboy/GambatteLink.cs | 1 - 3 files changed, 5 deletions(-) diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index 138c7d2c20..ff67d67e44 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -3000,10 +3000,8 @@ namespace BizHawk.Client.EmuHawk string details = Emulator.CoreComm.RomStatusDetails; if (!string.IsNullOrEmpty(details)) { - Sound.StopSound(); Tools.Load(); ((LogWindow) Tools.Get()).ShowReport("Dump Status Report", details); - Sound.StartSound(); } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs index a80b2269db..52bc80cb98 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs @@ -36,8 +36,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy InitMemoryCallbacks(); CoreComm = comm; - comm.RomStatusAnnotation = null; - comm.RomStatusDetails = null; comm.NominalWidth = 160; comm.NominalHeight = 144; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs index d0a1f1015c..7d08326ccd 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs @@ -30,7 +30,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy L.ConnectMemoryCallbackSystem(_memorycallbacks); R.ConnectMemoryCallbackSystem(_memorycallbacks); - comm.RomStatusAnnotation = null; comm.RomStatusDetails = "LEFT:\r\n" + L.CoreComm.RomStatusDetails + "RIGHT:\r\n" + R.CoreComm.RomStatusDetails; comm.NominalWidth = L.CoreComm.NominalWidth + R.CoreComm.NominalWidth; comm.NominalHeight = L.CoreComm.NominalHeight;