diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs index 21ec221c47..344a81c489 100644 --- a/BizHawk.Client.Common/RomLoader.cs +++ b/BizHawk.Client.Common/RomLoader.cs @@ -682,11 +682,9 @@ namespace BizHawk.Client.Common break; case "AppleII": - var assets = xmlGame.Assets.Select(a => Database.GetGameInfo(a.Value, a.Key)); var roms = xmlGame.Assets.Select(a => a.Value); nextEmulator = new AppleII( nextComm, - assets, roms, (AppleII.Settings)GetCoreSettings()); break; diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs index fa854b11d3..40837b6ea4 100644 --- a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs +++ b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs @@ -21,14 +21,14 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII AppleIIController.BoolButtons.AddRange(ExtraButtons); } - public AppleII(CoreComm comm, IEnumerable gameInfoSet, IEnumerable romSet, Settings settings) - : this(comm, gameInfoSet.First(), romSet.First(), settings) + public AppleII(CoreComm comm, IEnumerable romSet, Settings settings) + : this(comm, romSet.First(), settings) { _romSet = romSet.ToList(); } [CoreConstructor("AppleII")] - public AppleII(CoreComm comm, GameInfo game, byte[] rom, Settings settings) + public AppleII(CoreComm comm, byte[] rom, Settings settings) { var ser = new BasicServiceProvider(this); ServiceProvider = ser; diff --git a/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs b/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs index 2765f0bbfc..ab1a070417 100644 --- a/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs +++ b/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs @@ -32,7 +32,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex public SerialPort serialport; [CoreConstructor("VEC")] - public VectrexHawk(CoreComm comm, GameInfo game, byte[] rom, /*string gameDbFn,*/ object settings, object syncSettings) + public VectrexHawk(CoreComm comm, byte[] rom, object settings, object syncSettings) { var ser = new BasicServiceProvider(this); @@ -56,7 +56,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex byte[] Bios = null; byte[] Mine = null; - Bios = comm.CoreFileProvider.GetFirmware("Vectrex", "Bios", true, "BIOS Not Found, Cannot Load"); + Bios = comm.CoreFileProvider.GetFirmware("Vectrex", "Bios", true, "BIOS Not Found, Cannot Load"); _bios = Bios; Mine = comm.CoreFileProvider.GetFirmware("Vectrex", "Minestorm", true, "Minestorm Not Found, Cannot Load"); diff --git a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs index 6b6a5e5944..354df1f947 100644 --- a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs +++ b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs @@ -15,7 +15,7 @@ namespace BizHawk.Emulation.Cores.Intellivision IBoardInfo, IDebuggable, ISettable { [CoreConstructor("INTV")] - public Intellivision(CoreComm comm, GameInfo game, byte[] rom, object settings, object syncSettings) + public Intellivision(CoreComm comm, byte[] rom, object settings, object syncSettings) { var ser = new BasicServiceProvider(this); ServiceProvider = ser;