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

simplify and remove some code in O2 constructor

This commit is contained in:
adelikat 2020-08-17 11:52:09 -05:00
parent 47fe939b41
commit 4153df9471
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs
View File

@ -44,7 +44,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
public bool is_G7400;
[CoreConstructor("O2")]
public O2Hawk(CoreComm comm, GameInfo game, byte[] rom, /*string gameDbFn,*/ O2Settings settings, O2SyncSettings syncSettings)
public O2Hawk(CoreComm comm, GameInfo game, byte[] rom, O2Settings settings, O2SyncSettings syncSettings)
{
var ser = new BasicServiceProvider(this);
@ -59,8 +59,8 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
OnExecFetch = ExecFetch,
};
_settings = (O2Settings)settings ?? new O2Settings();
_syncSettings = (O2SyncSettings)syncSettings ?? new O2SyncSettings();
_settings = settings ?? new O2Settings();
_syncSettings = syncSettings ?? new O2SyncSettings();
is_G7400 = _syncSettings.G7400_Enable;
@ -89,9 +89,6 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
ser.Register<IVideoProvider>(this);
ServiceProvider = ser;
_settings = (O2Settings)settings ?? new O2Settings();
_syncSettings = (O2SyncSettings)syncSettings ?? new O2SyncSettings();
_tracer = new TraceBuffer { Header = cpu.TraceHeader };
ser.Register(_tracer);
ser.Register<IStatable>(new StateSerializer(SyncState));