From 1fab08f91ca237ad6c72fda795477d00e0bb1481 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 13 May 2017 08:36:52 -0500 Subject: [PATCH] C64 - Convert Chip90611401 to not use SyncObject --- .../Computers/Commodore64/C64.Motherboard.cs | 5 ++++- .../Computers/Commodore64/MOS/Chip90611401.cs | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs index 9885dd55a3..66623843ad 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs @@ -296,7 +296,10 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64 Cpu.SyncState(ser); ser.EndSection(); - ser.BeginSection("Pla"); SaveState.SyncObject(ser, Pla); ser.EndSection(); + ser.BeginSection("Pla"); + Pla.SyncState(ser); + ser.EndSection(); + ser.BeginSection("Ram"); SaveState.SyncObject(ser, Ram); ser.EndSection(); ser.BeginSection("Sid"); SaveState.SyncObject(ser, Sid); ser.EndSection(); ser.BeginSection("Vic"); SaveState.SyncObject(ser, Vic); ser.EndSection(); diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip90611401.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip90611401.cs index d019610925..2809541f9e 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip90611401.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip90611401.cs @@ -282,7 +282,20 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS public void SyncState(Serializer ser) { - SaveState.SyncObject(ser, this); + ser.Sync("_p24", ref _p24); + ser.Sync("_p25", ref _p25); + ser.Sync("_p26", ref _p26); + ser.Sync("_p27", ref _p27); + ser.Sync("_p28", ref _p28); + ser.Sync("_loram", ref _loram); + ser.Sync("_hiram", ref _hiram); + ser.Sync("_game", ref _game); + ser.Sync("_exrom", ref _exrom); + ser.Sync("_charen", ref _charen); + ser.Sync("_a15", ref _a15); + ser.Sync("_a14", ref _a14); + ser.Sync("_a13", ref _a13); + ser.Sync("_a12", ref _a12); } public int VicRead(int addr)