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

remove unused GameInfo parameter in some core constructors

This commit is contained in:
adelikat 2020-03-15 10:19:01 -05:00
parent f4b1d3f747
commit c66243254c
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/RomLoader.cs
View File

@ -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<AppleII>());
break;

6
BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
View File

@ -21,14 +21,14 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII
AppleIIController.BoolButtons.AddRange(ExtraButtons);
}
public AppleII(CoreComm comm, IEnumerable<GameInfo> gameInfoSet, IEnumerable<byte[]> romSet, Settings settings)
: this(comm, gameInfoSet.First(), romSet.First(), settings)
public AppleII(CoreComm comm, IEnumerable<byte[]> 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;

4
BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs
View File

@ -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");

2
BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs
View File

@ -15,7 +15,7 @@ namespace BizHawk.Emulation.Cores.Intellivision
IBoardInfo, IDebuggable, ISettable<Intellivision.IntvSettings, Intellivision.IntvSyncSettings>
{
[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;