From bd458fc0dcb460a539acafb0dec7ff52cdb18b65 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 30 Nov 2014 23:50:07 +0000
Subject: [PATCH] Ti83 - nit picky reorg

---
 .../BizHawk.Emulation.Cores.csproj            |  3 +++
 .../Calculator/TI83.IInputPollable.cs         | 22 +++++++++++++++++++
 .../Calculator/TI83.IStatable.cs              |  4 ++--
 BizHawk.Emulation.Cores/Calculator/TI83.cs    | 22 +++++++------------
 4 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 BizHawk.Emulation.Cores/Calculator/TI83.IInputPollable.cs

diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index 31682556b2..edee8e755e 100644
--- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -85,6 +85,9 @@
     <Compile Include="..\VersionInfo.cs">
       <Link>VersionInfo.cs</Link>
     </Compile>
+    <Compile Include="Calculator\TI83.IInputPollable.cs">
+        <DependentUpon>TI83.cs</DependentUpon>
+    </Compile>
     <Compile Include="Calculator\TI83.IMemoryDomains.cs">
       <DependentUpon>TI83.cs</DependentUpon>
     </Compile>
diff --git a/BizHawk.Emulation.Cores/Calculator/TI83.IInputPollable.cs b/BizHawk.Emulation.Cores/Calculator/TI83.IInputPollable.cs
new file mode 100644
index 0000000000..75f3bdf51e
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Calculator/TI83.IInputPollable.cs
@@ -0,0 +1,22 @@
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Emulation.Cores.Calculators
+{
+	public partial class TI83 : IInputPollable
+	{
+		private int _lagCount = 0;
+		private bool _lagged = true;
+		private bool _isLag = false;
+
+		public int LagCount
+		{
+			get { return _lagCount; }
+			set { _lagCount = value; }
+		}
+
+		public bool IsLagFrame
+		{
+			get { return _isLag; }
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Calculator/TI83.IStatable.cs b/BizHawk.Emulation.Cores/Calculator/TI83.IStatable.cs
index 68a63e10ea..ebcdebb58b 100644
--- a/BizHawk.Emulation.Cores/Calculator/TI83.IStatable.cs
+++ b/BizHawk.Emulation.Cores/Calculator/TI83.IStatable.cs
@@ -73,8 +73,8 @@ namespace BizHawk.Emulation.Cores.Calculators
 			ser.Sync("m_LinkOutput", ref m_LinkOutput);
 			ser.Sync("VRAM", ref vram, false);
 			ser.Sync("Frame", ref frame);
-			ser.Sync("LagCount", ref lagCount);
-			ser.Sync("IsLag", ref isLag);
+			ser.Sync("LagCount", ref _lagCount);
+			ser.Sync("IsLag", ref _isLag);
 			ser.EndSection();
 		}
 	}
diff --git a/BizHawk.Emulation.Cores/Calculator/TI83.cs b/BizHawk.Emulation.Cores/Calculator/TI83.cs
index c2829076ba..0a38ac2d0d 100644
--- a/BizHawk.Emulation.Cores/Calculator/TI83.cs
+++ b/BizHawk.Emulation.Cores/Calculator/TI83.cs
@@ -47,10 +47,6 @@ namespace BizHawk.Emulation.Cores.Calculators
 
 		internal bool LinkActive;
 		private bool m_CursorMoved;
-
-		private int lagCount = 0;
-		private bool lagged = true;
-		private bool isLag = false;
 		private int frame;
 
 		[CoreConstructor("TI83")]
@@ -127,7 +123,7 @@ namespace BizHawk.Emulation.Cores.Calculators
 					}
 					break;
 				case 1: //PORT_KEYBOARD:
-					lagged = false;
+					_lagged = false;
 					keyboardMask = value;
 					//Console.WriteLine("write PORT_KEYBOARD {0:X2}",value);
 					break;
@@ -468,7 +464,7 @@ namespace BizHawk.Emulation.Cores.Calculators
 
 		public void FrameAdvance(bool render, bool rendersound)
 		{
-			lagged = true;
+			_lagged = true;
 			//I eyeballed this speed
 			for (int i = 0; i < 5; i++)
 			{
@@ -479,14 +475,14 @@ namespace BizHawk.Emulation.Cores.Calculators
 			}
 
 			Frame++;
-			if (lagged)
+			if (_lagged)
 			{
-				lagCount++;
-				isLag = true;
+				_lagCount++;
+				_isLag = true;
 			}
 			else
 			{
-				isLag = false;
+				_isLag = false;
 			}
 		}
 
@@ -513,14 +509,12 @@ namespace BizHawk.Emulation.Cores.Calculators
 		}
 
 		public int Frame { get { return frame; } set { frame = value; } }
-		public int LagCount { get { return lagCount; } set { lagCount = value; } }
-		public bool IsLagFrame { get { return isLag; } }
 
 		public void ResetCounters()
 		{
 			Frame = 0;
-			lagCount = 0;
-			isLag = false;
+			_lagCount = 0;
+			_isLag = false;
 		}
 
 		public bool DeterministicEmulation { get { return true; } }