From 6f1272929f9a923eec40c055e1ad670349444d21 Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Tue, 15 Feb 2011 21:40:08 +0000
Subject: [PATCH] Make a DoFrameAdvance() function that will handle any per
 frame activities (such as updating dialogs), currently it still is called
 constantly instead of once per frame

---
 BizHawk.MultiClient/MainForm.cs | 16 ++++++++++++----
 BizHawk.MultiClient/Rewind.cs   |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index e30d3c4816..07bb990666 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -356,6 +356,15 @@ namespace BizHawk.MultiClient
         [System.Security.SuppressUnmanagedCodeSecurity, DllImport("User32.dll", CharSet = CharSet.Auto)]
         public static extern bool PeekMessage(out Message msg, IntPtr hWnd, UInt32 msgFilterMin, UInt32 msgFilterMax, UInt32 flags);
 
+        /// <summary>
+        /// This functions calls Emulator.FrameAdvance(true) and handles any updates that need to happen on a per frame basis
+        /// </summary>
+        public void DoFrameAdvance()
+        {
+            Global.Emulator.FrameAdvance(true); //TODO: Do these things need to happen on (false) as well? Think about it
+            RamWatch1.UpdateValues();
+        }
+
         public void GameTick()
         {
             Input.Update();
@@ -365,7 +374,7 @@ namespace BizHawk.MultiClient
             if (EmulatorPaused == false)
             {
                 CaptureRewindState();
-                Global.Emulator.FrameAdvance(true);
+                DoFrameAdvance();
             }
 
             if (!Global.ClientControls.IsPressed("Frame Advance"))
@@ -378,7 +387,7 @@ namespace BizHawk.MultiClient
                 {
                     if (EmulatorPaused == false)
                         PauseEmulator();
-                    Global.Emulator.FrameAdvance(true);
+                    DoFrameAdvance();
                     FrameAdvanceDelay--;
                 }
                 else
@@ -392,7 +401,7 @@ namespace BizHawk.MultiClient
 
             if (Global.ClientControls["Frame Advance"] && FrameAdvanceDelay == 0)
             {
-                Global.Emulator.FrameAdvance(true);
+                DoFrameAdvance();
             }
 
             if (/*Global.Config.RewindEnabled && */Global.ClientControls["Rewind"])
@@ -513,7 +522,6 @@ namespace BizHawk.MultiClient
 
             Global.Sound.UpdateSound(Global.Emulator.SoundProvider);
             Render();
-            //RamWatch1.UpdateValues();  //TODO: This should update only once per frame
         }
 
         private bool wasMaximized = false;
diff --git a/BizHawk.MultiClient/Rewind.cs b/BizHawk.MultiClient/Rewind.cs
index f279accbbe..4cc1cb657f 100644
--- a/BizHawk.MultiClient/Rewind.cs
+++ b/BizHawk.MultiClient/Rewind.cs
@@ -160,7 +160,7 @@ namespace BizHawk.MultiClient
                     RewindLarge();
             }
 
-            Global.Emulator.FrameAdvance(true);
+            DoFrameAdvance();
             Global.Sound.UpdateSound(Global.Emulator.SoundProvider);
             Render();
         }