From 383baa6d1e8ad92e64478f5d2d2b849343e8318e Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 12 May 2017 16:26:04 -0500
Subject: [PATCH] c64 - savestate refactor round 1 - do explicit savestating
 for the root C64 object

---
 .../Computers/Commodore64/C64.IEmulator.cs    |  4 ++--
 .../Commodore64/C64.IInputPollable.cs         | 18 +++++++++++---
 .../Computers/Commodore64/C64.IStatable.cs    | 24 ++++++++++++-------
 .../Computers/Commodore64/C64.cs              | 10 +++++---
 4 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IEmulator.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IEmulator.cs
index 621963da8f..d37d5ef319 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IEmulator.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IEmulator.cs
@@ -32,8 +32,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 		public void ResetCounters()
 		{
 			_frame = 0;
-			LagCount = 0;
-			IsLagFrame = false;
+			_lagCount = 0;
+			_isLagFrame = false;
 			_frameCycles = 0;
 		}
 
diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IInputPollable.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IInputPollable.cs
index 9908da6309..43e00a2e38 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IInputPollable.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IInputPollable.cs
@@ -2,12 +2,24 @@
 
 namespace BizHawk.Emulation.Cores.Computers.Commodore64
 {
-	public partial class C64 : IInputPollable
+	public partial class C64// : IInputPollable
 	{
-		public bool IsLagFrame { get; set; }
-		public int LagCount { get; set; }
+		public bool IsLagFrame
+		{
+			get { return _isLagFrame; }
+			set { _isLagFrame = value; }
+		}
+
+		public int LagCount
+		{
+			get { return _lagCount; }
+			set { _lagCount = value; }
+		}
 
 		[SaveState.DoNotSave]
 		public IInputCallbackSystem InputCallbacks { get; private set; }
+
+		private bool _isLagFrame;
+		private int _lagCount;
 	}
 }
diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IStatable.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IStatable.cs
index 7cafb90d5e..96c8e9ab8f 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IStatable.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IStatable.cs
@@ -31,19 +31,25 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 
 		public byte[] SaveStateBinary()
 		{
-		    using (var ms = new MemoryStream())
-		    {
-                var bw = new BinaryWriter(ms);
-                SaveStateBinary(bw);
-                bw.Flush();
-                return ms.ToArray();
-            }
-        }
+			using (var ms = new MemoryStream())
+			{
+				var bw = new BinaryWriter(ms);
+				SaveStateBinary(bw);
+				bw.Flush();
+				return ms.ToArray();
+			}
+		}
 
 		private void SyncState(Serializer ser)
 		{
 			ser.BeginSection("core");
-			SaveState.SyncObject(ser, this);
+			ser.Sync("_frameCycles", ref _frameCycles);
+			ser.Sync("Frame", ref _frame);
+			ser.Sync("IsLagFrame", ref _isLagFrame);
+			ser.Sync("LagCount", ref _lagCount);
+			ser.BeginSection("Board");
+			SaveState.SyncObject(ser, _board);
+			ser.EndSection();
 			ser.EndSection();
 		}
 	}
diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs
index d64790f9d9..52b471b75a 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs
@@ -60,6 +60,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 		{
 			get
 			{
+				return SaveState.InspectProperties(this);
 				if (_board.CartPort.IsConnected)
 				{
 					return _board.CartPort.CartridgeType;
@@ -135,10 +136,13 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 			}
 
 			_board.Flush();
-			IsLagFrame = !_board.InputRead;
+			_isLagFrame = !_board.InputRead;
+
+			if (_isLagFrame)
+			{
+				_lagCount++;
+			}
 
-			if (IsLagFrame)
-				LagCount++;
 			_frameCycles -= _cyclesPerFrame;
 			_frame++;
 		}