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

fix #3692

This commit is contained in:
CasualPokePlayer 2023-07-23 03:58:46 -07:00
parent dd5cbc92af
commit 739c35c174
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubGBHawk/SubGBHawk.cs
View File

@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SubGBHawk
[Core(CoreNames.SubGbHawk, "")] [Core(CoreNames.SubGbHawk, "")]
[ServiceNotApplicable(new[] { typeof(IDriveLight) })] [ServiceNotApplicable(new[] { typeof(IDriveLight) })]
public partial class SubGBHawk : IEmulator, IStatable, IInputPollable, public partial class SubGBHawk : IEmulator, IStatable, IInputPollable,
ISettable<GBHawk.GBHawk.GBSettings, GBHawk.GBHawk.GBSyncSettings>, IDebuggable, ICycleTiming ISettable<GBHawk.GBHawk.GBSettings, GBHawk.GBHawk.GBSyncSettings>, IDebuggable, ICycleTiming, IGameboyCommon
{ {
[CoreConstructor(VSystemID.Raw.GB, Priority = CorePriority.SuperLow)] [CoreConstructor(VSystemID.Raw.GB, Priority = CorePriority.SuperLow)]
[CoreConstructor(VSystemID.Raw.GBC, Priority = CorePriority.SuperLow)] [CoreConstructor(VSystemID.Raw.GBC, Priority = CorePriority.SuperLow)]
@ -37,15 +37,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.SubGBHawk
ser.Register(_GBCore.ServiceProvider.GetService<ISaveRam>()); ser.Register(_GBCore.ServiceProvider.GetService<ISaveRam>());
ser.Register(_GBCore.ServiceProvider.GetService<IRegionable>()); ser.Register(_GBCore.ServiceProvider.GetService<IRegionable>());
ser.Register(_GBCore.ServiceProvider.GetService<ICodeDataLogger>()); ser.Register(_GBCore.ServiceProvider.GetService<ICodeDataLogger>());
ser.Register(_GBCore.ServiceProvider.GetService<IGameboyCommon>());
_tracer = new TraceBuffer(_GBCore.cpu.TraceHeader); _tracer = new TraceBuffer(_GBCore.cpu.TraceHeader);
ser.Register(_tracer); ser.Register(_tracer);
} }
public GBHawk.GBHawk _GBCore; public GBHawk.GBHawk _GBCore;
// needed for movies to accurately calculate timing // needed for movies to accurately calculate timing
private long _cycleCount; private long _cycleCount;
public long CycleCount => _cycleCount; public long CycleCount => _cycleCount;
@ -79,5 +78,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.SubGBHawk
public void Step(StepType type) => throw new NotImplementedException(); public void Step(StepType type) => throw new NotImplementedException();
public long TotalExecutedCycles => _cycleCount; public long TotalExecutedCycles => _cycleCount;
public bool IsCGBMode => _GBCore.IsCGBMode;
public bool IsCGBDMGMode => _GBCore.IsCGBDMGMode;
public IGPUMemoryAreas LockGPU() => _GBCore.LockGPU();
public void SetScanlineCallback(ScanlineCallback callback, int line)
=> _GBCore.SetScanlineCallback(callback, line);
public void SetPrinterCallback(PrinterCallback callback)
=> _GBCore.SetPrinterCallback(callback);
} }
} }