diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.ISettable.cs b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.ISettable.cs index 91b1e5d31f..a1bd7be8e4 100644 --- a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.ISettable.cs +++ b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.ISettable.cs @@ -37,6 +37,9 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII { _settings = o; _machine.Video.IsMonochrome = _settings.Monochrome; + + setCallbacks(); + return false; } diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs index 21b57a5d99..cad6c19f38 100644 --- a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs +++ b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs @@ -54,12 +54,7 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII ser.Register(Tracer); - //Set up Memory Callbacks - _machine.Memory.ReadCallback = MemoryCallbacks.CallReads; - _machine.Memory.WriteCallback = MemoryCallbacks.CallWrites; - _machine.Memory.ExecuteCallback = MemoryCallbacks.CallExecutes; - - _machine.Memory.InputCallback = InputCallbacks.Call; + setCallbacks(); InitSaveStates(); SetupMemoryDomains(); @@ -180,5 +175,14 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII Frame++; } + + private void setCallbacks() + { + _machine.Memory.ReadCallback = MemoryCallbacks.CallReads; + _machine.Memory.WriteCallback = MemoryCallbacks.CallWrites; + _machine.Memory.ExecuteCallback = MemoryCallbacks.CallExecutes; + _machine.Memory.InputCallback = InputCallbacks.Call; + } + } } diff --git a/ExternalCoreProjects/Virtu/Machine.cs b/ExternalCoreProjects/Virtu/Machine.cs index 24c5b64b0f..c8ed15e4ca 100644 --- a/ExternalCoreProjects/Virtu/Machine.cs +++ b/ExternalCoreProjects/Virtu/Machine.cs @@ -83,7 +83,6 @@ namespace Jellyfish.Virtu } } - public void BizInitialize() { Initialize(); @@ -139,11 +138,12 @@ namespace Jellyfish.Virtu }; ser.Converters.Add(new TypeTypeConverter(new[] - { - // all expected Types to convert are either in this assembly or mscorlib - typeof(Machine).Assembly, - typeof(object).Assembly - })); + { + // all expected Types to convert are either in this assembly or mscorlib + typeof(Machine).Assembly, + typeof(object).Assembly + })); + ser.Converters.Add(new DelegateConverter()); ser.Converters.Add(new ArrayConverter()); diff --git a/References/Virtu.dll b/References/Virtu.dll index bcea43dda8..77c0260f55 100644 Binary files a/References/Virtu.dll and b/References/Virtu.dll differ