diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs index 5b0a58d370..eb388350fe 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs @@ -86,7 +86,7 @@ namespace BizHawk.Client.EmuHawk if (schemaType == null) return; var padSchemata = ((IVirtualPadSchema) Activator.CreateInstance(schemaType)) - .GetPadSchemas(Emulator) + .GetPadSchemas(Emulator, s => MessageBox.Show(s)) .ToList(); if (VersionInfo.DeveloperBuild) diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs index d5b5798b48..19d9414aa8 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -10,7 +11,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class A26Schema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { var ss = ((Atari2600)core).GetSyncSettings().Clone(); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs index b6cf4ce214..b33fd8dc03 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -15,7 +16,7 @@ namespace BizHawk.Client.EmuHawk private static string ProLineControllerName => typeof(ProLineController).DisplayName(); private static string LightGunControllerName => typeof(LightGunController).DisplayName(); - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { var ss = ((A7800Hawk)core).GetSyncSettings().Clone(); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs index 47afab2b2b..6cc61eecca 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -9,7 +10,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class AppleIISchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { yield return Keyboard(); yield return DiskSelection(); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs index ade55afeca..5fb419ba65 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -9,7 +10,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class C64Schema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { yield return StandardController(1); yield return StandardController(2); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs index 56e2227183..4e57204a8a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using System.Linq; using BizHawk.Emulation.Common; @@ -10,7 +11,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class ColecoSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { var deck = ((ColecoVision)core).ControllerDeck; var ports = new[] { deck.Port1.GetType(), deck.Port2.GetType() }; diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs index faeae41edd..5391c76a84 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -9,7 +10,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class DualGbSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { yield return StandardController(1); yield return StandardController(2); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs index 7078dd1077..dee8ba02cc 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -10,7 +11,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class GbaSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { yield return StandardController(); yield return ConsoleButtons(); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs index ef6b095e55..fb327c2f3f 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -9,7 +10,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class GbSchema : IVirtualPadSchema { - public virtual IEnumerable GetPadSchemas(IEmulator core) + public virtual IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { switch (core.ControllerDefinition.Name) { @@ -113,7 +114,7 @@ namespace BizHawk.Client.EmuHawk [Schema("GB3x")] public class Gb3XSchema : GbSchema { - public override IEnumerable GetPadSchemas(IEmulator core) + public override IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { yield return StandardControllerH(1); yield return StandardControllerH(2); @@ -125,7 +126,7 @@ namespace BizHawk.Client.EmuHawk [Schema("GB4x")] public class Gb4XSchema : GbSchema { - public override IEnumerable GetPadSchemas(IEmulator core) + public override IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { yield return StandardControllerH(1); yield return StandardControllerH(2); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs index 6e1a029eda..9d5c409aa8 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -9,7 +10,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class GGLSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { yield return StandardController(1); yield return StandardController(2); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs index aca618d0d6..5509eb2205 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -11,7 +12,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class GenSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { if (core is GPGX gpgx) { diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IVirtualPadSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IVirtualPadSchema.cs index 7c4d5935a1..9fd0512cb4 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IVirtualPadSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IVirtualPadSchema.cs @@ -1,10 +1,11 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { public interface IVirtualPadSchema { - IEnumerable GetPadSchemas(IEmulator core); + IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox); } } diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs index d6a1646a45..db53c73cbc 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -15,7 +16,7 @@ namespace BizHawk.Client.EmuHawk private string StandardControllerName => typeof(StandardController).DisplayName(); private string AnalogControllerName => typeof(FakeAnalogController).DisplayName(); - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { var intvSyncSettings = ((Intellivision)core).GetSyncSettings().Clone(); var port1 = intvSyncSettings.Port1; diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs index 5f9ade0e5d..9e22f95e39 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -9,7 +10,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class LynxSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { yield return new PadSchema { diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs index 8cfb719aad..85f398a1d8 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Common; @@ -11,7 +12,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class N64Schema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { var ss = ((N64)core).GetSyncSettings(); for (var i = 0; i < 4; i++) diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs index 4d75bb0731..599909e86c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -8,7 +9,7 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema // ReSharper disable once UnusedMember.Global public class NdsSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { yield return Controller(); yield return Console(); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs index f82cceade1..05dced89e8 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs @@ -15,7 +15,7 @@ namespace BizHawk.Client.EmuHawk public class NesSchema : IVirtualPadSchema { /// found ControllerSNES - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { if (core is NES || core is SubNESHawk) { diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs index fb51d978e9..2a444097ec 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -9,7 +10,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class NgpSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { yield return Controller(); yield return ConsoleButtons(); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs index 0bc7c658ee..db8ecb96b6 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -8,7 +9,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class O2Schema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { yield return StandardController(1); yield return StandardController(2); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs index 996d8a8907..5e128209ef 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Common; @@ -11,7 +12,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class PsxSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { var psx = (Octoshock)core; var settings = psx.GetSyncSettings(); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs index 8e18af7e8f..5c3fc03089 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs @@ -1,7 +1,7 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using System.Linq; -using System.Windows.Forms; using BizHawk.Common; using BizHawk.Emulation.Common; @@ -21,17 +21,17 @@ namespace BizHawk.Client.EmuHawk [Schema("PCE")] public class PceSchema : IVirtualPadSchema { - public virtual IEnumerable GetPadSchemas(IEmulator core) + public virtual IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { return core switch { - PCEngine pce => PceHawkSchemas(pce), - NymaCore nyma => NymaSchemas(nyma), + PCEngine pce => PceHawkSchemas(pce, showMessageBox), + NymaCore nyma => NymaSchemas(nyma, showMessageBox), _ => Enumerable.Empty() }; } - private static IEnumerable PceHawkSchemas(PCEngine core) + private static IEnumerable PceHawkSchemas(PCEngine core, Action showMessageBox) { var ss = core.GetSyncSettings(); @@ -44,18 +44,18 @@ namespace BizHawk.Client.EmuHawk ss.Port5 } .Where(p => p != PceControllerType.Unplugged) - .Select((p, i) => PceHawkGenerateSchemaForPort(p, i + 1)) + .Select((p, i) => PceHawkGenerateSchemaForPort(p, i + 1, showMessageBox)) .Where(s => s != null); return padSchemas; } - private static PadSchema PceHawkGenerateSchemaForPort(PceControllerType type, int controller) + private static PadSchema PceHawkGenerateSchemaForPort(PceControllerType type, int controller, Action showMessageBox) { switch (type) { default: - MessageBox.Show($"{type} is not supported yet"); + showMessageBox($"{type} is not supported yet"); return null; case PceControllerType.Unplugged: return null; @@ -83,7 +83,7 @@ namespace BizHawk.Client.EmuHawk }; } - private static IEnumerable NymaSchemas(NymaCore nyma) + private static IEnumerable NymaSchemas(NymaCore nyma, Action showMessageBox) { foreach (NymaCore.PortResult result in nyma.ActualPortData) { @@ -99,7 +99,7 @@ namespace BizHawk.Client.EmuHawk } else if (device != "none") { - MessageBox.Show($"Controller type {device} not supported yet."); + showMessageBox($"Controller type {device} not supported yet."); } } diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs index acd6dfbb49..905eec0a25 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs @@ -1,7 +1,7 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using System.Linq; -using System.Windows.Forms; using BizHawk.Common; using BizHawk.Emulation.Common; @@ -13,13 +13,13 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class PcfxSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { var nyma = (NymaCore) core; - return NymaSchemas(nyma); + return NymaSchemas(nyma, showMessageBox); } - private static IEnumerable NymaSchemas(NymaCore nyma) + private static IEnumerable NymaSchemas(NymaCore nyma, Action showMessageBox) { foreach (NymaCore.PortResult result in nyma.ActualPortData) { @@ -35,7 +35,7 @@ namespace BizHawk.Client.EmuHawk } else if (device != "none") { - MessageBox.Show($"Controller type {device} not supported yet."); + showMessageBox($"Controller type {device} not supported yet."); } } diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs index cc0ebd5735..afd956b4be 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -9,7 +10,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class SgbSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { yield return StandardController(1); yield return StandardController(2); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs index 89eedaab8e..49a178c3c9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs @@ -1,11 +1,12 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using System.Linq; -using System.Windows.Forms; using BizHawk.Common; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Waterbox; + namespace BizHawk.Client.EmuHawk { [Schema("SAT")] @@ -14,7 +15,7 @@ namespace BizHawk.Client.EmuHawk { private static readonly AxisSpec AxisRange = new AxisSpec(0.RangeTo(0xffff), 0x8000); - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { var nyma = (NymaCore)core; foreach (var result in nyma.ActualPortData @@ -22,7 +23,7 @@ namespace BizHawk.Client.EmuHawk { var num = int.Parse(result.Port.ShortName.Last().ToString()); var device = result.Device.ShortName; - var schema = GenerateSchemaForPort(device, num); + var schema = GenerateSchemaForPort(device, num, showMessageBox); if (schema != null) { yield return schema; @@ -32,12 +33,12 @@ namespace BizHawk.Client.EmuHawk yield return ConsoleButtons(); } - private static PadSchema GenerateSchemaForPort(string device, int controllerNum) + private static PadSchema GenerateSchemaForPort(string device, int controllerNum, Action showMessageBox) { switch (device) { default: - MessageBox.Show($"This peripheral `{device}` is not supported yet"); + showMessageBox($"This peripheral `{device}` is not supported yet"); return null; case "none": return null; diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs index 7f6102800b..7c9dc13eff 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Sega.MasterSystem; @@ -9,7 +10,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class SmsSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { if (((SMS)core).IsGameGear) { diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs index b2b0c84a58..7458ac14f5 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs @@ -1,7 +1,7 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using System.Linq; -using System.Windows.Forms; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Nintendo.SNES; using BizHawk.Emulation.Cores.Nintendo.SNES9X; @@ -13,7 +13,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class SnesSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { if (core is LibsnesCore bsnes) { @@ -22,7 +22,7 @@ namespace BizHawk.Client.EmuHawk if (core is NymaCore nyma) { - return GetFaustSchemas(nyma); + return GetFaustSchemas(nyma, showMessageBox); } return GetSnes9xPadSchemas((Snes9x)core); @@ -115,7 +115,7 @@ namespace BizHawk.Client.EmuHawk yield return ConsoleButtons(); } - private static IEnumerable GetFaustSchemas(NymaCore nyma) + private static IEnumerable GetFaustSchemas(NymaCore nyma, Action showMessageBox) { foreach (NymaCore.PortResult result in nyma.ActualPortData) { @@ -127,7 +127,7 @@ namespace BizHawk.Client.EmuHawk } else if (device != "none") { - MessageBox.Show($"Controller type {device} not supported yet."); + showMessageBox($"Controller type {device} not supported yet."); } } diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs index 36d4aa8d8c..083233a509 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -10,7 +11,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class VecSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { var vecSyncSettings = ((VectrexHawk)core).GetSyncSettings().Clone(); var port1 = vecSyncSettings.Port1; diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs index 8607e273e5..6ef975d2ed 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -9,7 +10,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class VirtualBoySchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { yield return StandardController(); yield return ConsoleButtons(); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs index f66c5c657c..f30f67b1bb 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -9,7 +10,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global public class WonderSwanSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { yield return StandardController(1); yield return RotatedController(2); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs index c413647244..a5e00faeb4 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; @@ -9,7 +10,7 @@ namespace BizHawk.Client.EmuHawk // ReSharper disable once UnusedMember.Global internal class ZxSpectrumSchema : IVirtualPadSchema { - public IEnumerable GetPadSchemas(IEmulator core) + public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { yield return Joystick(1); yield return Joystick(2);