From b0b5245d45119241823199c53ecf95feb0d8b655 Mon Sep 17 00:00:00 2001
From: goyuken <goyuken@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Mon, 6 Oct 2014 16:00:24 +0000
Subject: [PATCH] C64: add bool[] overload to the serializer.  sloppy, but
 neater.

---
 BizHawk.Common/Serializer.cs                  | 41 +++++++++++++++++++
 BizHawk.Common/Util.cs                        | 20 +++++++++
 .../Computers/Commodore64/SaveState.cs        | 15 ++-----
 3 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/BizHawk.Common/Serializer.cs b/BizHawk.Common/Serializer.cs
index 845bf5cbe3..48a74dadac 100644
--- a/BizHawk.Common/Serializer.cs
+++ b/BizHawk.Common/Serializer.cs
@@ -231,6 +231,47 @@ namespace BizHawk.Common
 			}
 		}
 
+		public void Sync(string name, ref bool[] val, bool useNull)
+		{
+			if (IsText)
+			{
+				SyncText(name, ref val, useNull);
+			}
+			else if (IsReader)
+			{
+				val = Util.ByteBufferToBoolBuffer(Util.ReadByteBuffer(_br, false));
+				if (val == null && !useNull)
+				{
+					val = new bool[0];
+				}
+			}
+			else
+			{
+				Util.WriteByteBuffer(_bw, Util.BoolBufferToByteBuffer(val));
+			}
+		}
+
+		public void SyncText(string name, ref bool[] val, bool useNull)
+		{
+			if (IsReader)
+			{
+				if (Present(name))
+				{
+					var bytes = Util.HexStringToBytes(Item(name));
+					val = Util.ByteBufferToBoolBuffer(bytes);
+				}
+
+				if (val != null && val.Length == 0 && useNull)
+				{
+					val = null;
+				}
+			}
+			else
+			{
+				var temp = val ?? new bool[0];
+				_tw.WriteLine("{0} {1}", name, Util.BoolBufferToByteBuffer(temp).BytesToHexString());
+			}
+		}
 		public void Sync(string name, ref short[] val, bool useNull)
 		{
 			if (IsText)
diff --git a/BizHawk.Common/Util.cs b/BizHawk.Common/Util.cs
index 1cd8db457f..0dc3f31839 100644
--- a/BizHawk.Common/Util.cs
+++ b/BizHawk.Common/Util.cs
@@ -98,6 +98,26 @@ namespace BizHawk.Common
 			}
 		}
 
+		public static bool[] ByteBufferToBoolBuffer(byte[] buf)
+		{
+			var ret = new bool[buf.Length];
+			for (int i = 0; i < buf.Length; i++)
+			{
+				ret[i] = buf[i] != 0;
+			}
+			return ret;
+		}
+
+		public static byte[] BoolBufferToByteBuffer(bool[] buf)
+		{
+			var ret = new byte[buf.Length];
+			for (int i = 0; i < buf.Length; i++)
+			{
+				ret[i] = (byte)(buf[i] ? 1 : 0);
+			}
+			return ret;
+		}
+
 		public static short[] ByteBufferToShortBuffer(byte[] buf)
 		{
 			int num = buf.Length / 2;
diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/SaveState.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/SaveState.cs
index 57594dbfa3..9c1aa6623c 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/SaveState.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/SaveState.cs
@@ -72,18 +72,9 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 								break;
                             case "Boolean[]":
                                 {
-                                    bool[] source = (bool[])currentValue;
-                                    refIntBuffer = new IntBuffer(source.Length);
-                                    for (int i = 0; i < source.Length; i++)
-                                    {
-                                        refIntBuffer[i] = source[i] ? -1 : 0;
-                                    }
-                                    ser.Sync(member.Name, ref refIntBuffer);
-                                    for (int i = 0; i < source.Length; i++)
-                                    {
-                                        source[i] = refIntBuffer[i] != 0;
-                                    }
-                                    currentValue = source;
+                                    bool[] tmp = (bool[])currentValue;
+									ser.Sync(member.Name, ref tmp, false);
+									currentValue = tmp;
                                 }
                                 break;
 							case "Byte":