From 3a8ae031d33763f6ba445a2e56841845c60cb0b9 Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Sat, 5 Jan 2019 13:00:37 -0600 Subject: [PATCH] GBHawkLink: Fix state error. --- .../Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs | 5 ----- .../Consoles/Nintendo/GBHawkLink/GBHawkLink.IStatable.cs | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs index 48ce21972b..1cebe9f5b4 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs @@ -14,11 +14,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink public ControllerDefinition ControllerDefinition => _controllerDeck.Definition; - public byte controller_state; - public bool in_vblank_old; - public bool in_vblank; - public bool vblank_rise; - public void FrameAdvance(IController controller, bool render, bool rendersound) { //Console.WriteLine("-----------------------FRAME-----------------------"); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IStatable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IStatable.cs index ffd05ea99f..5429566225 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IStatable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IStatable.cs @@ -60,6 +60,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink ser.Sync("_cableconnected", ref _cableconnected); ser.Sync("_cablediscosignal", ref _cablediscosignal); _controllerDeck.SyncState(ser); + + LinkConnected = _cableconnected; } } }