From 1ca4fb7ec93009513fb112c6c2017810c2da0f6d Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Tue, 15 Feb 2011 19:01:55 +0000
Subject: [PATCH] If frame advance is held, advance one frame, then delay 60
 ticks, then keep pressing frame advance while held.  Also, removed some code
 I forgot to delete in a previous commit.

---
 BizHawk.MultiClient/MainForm.cs | 58 +++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 83e4622a2e..1932814dad 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -19,7 +19,7 @@ namespace BizHawk.MultiClient
         private string CurrentlyOpenRom;
         private int SaveSlot = 0;   //Saveslot sytem
         private bool wasPaused = false; //For handling automatic pausing when entering the menu
-
+        private int FrameAdvanceDelay = 0;
         private bool EmulatorPaused = false;
         RamWatch RamWatch1 = new RamWatch();
         RamSearch RamSearch1 = new RamSearch();
@@ -344,21 +344,45 @@ 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>
-        /// Handles the display of information like frame counter, lag counter, and input
-        /// </summary>
-        private void DisplayInfo()
-        {
-            //Global.RenderPanel.AddMessage(Global.Emulator.Frame.ToString());
-        }
-
         public void GameTick()
         {
-            DisplayInfo();
             Input.Update();
             if (ActiveForm != null)
                 ScreenSaver.ResetTimerPeriodically();
 
+            if (EmulatorPaused == false)
+            {
+                CaptureRewindState();
+                Global.Emulator.FrameAdvance(true);
+            }
+
+            if (!Global.ClientControls.IsPressed("Frame Advance"))
+                FrameAdvanceDelay = 60;
+
+
+            if (Global.ClientControls["Frame Advance"] && FrameAdvanceDelay > 0)
+            {
+                if (FrameAdvanceDelay == 60)
+                {
+                    if (EmulatorPaused == false)
+                        EmulatorPaused = true;
+                    Global.Emulator.FrameAdvance(true);
+                    FrameAdvanceDelay--;
+                }
+                else
+                {
+                    if (FrameAdvanceDelay > 0)
+                        FrameAdvanceDelay--;
+                    if (FrameAdvanceDelay < 0)
+                        FrameAdvanceDelay = 0;
+                }
+            }
+
+            if (Global.ClientControls["Frame Advance"] && FrameAdvanceDelay == 0)
+            {
+                Global.Emulator.FrameAdvance(true);
+            }
+
             if (/*Global.Config.RewindEnabled && */Global.ClientControls["Rewind"])
             {
                 Rewind(Global.ClientControls["Fast Forward"] ? 3 : 1);
@@ -473,20 +497,6 @@ namespace BizHawk.MultiClient
                 ToggleFullscreen();
             }
 
-            if (EmulatorPaused == false)
-            {
-                CaptureRewindState();
-                Global.Emulator.FrameAdvance(true);
-            }
-
-            if (Global.ClientControls["Frame Advance"])
-            {
-                if (EmulatorPaused == false)
-                    EmulatorPaused = true;
-                Global.Emulator.FrameAdvance(true);
-                Global.ClientControls.UnpressButton("Frame Advance");
-            }
-
             Global.Sound.UpdateSound(Global.Emulator.SoundProvider);
             Render();
             //RamWatch1.UpdateValues();  //TODO: This should update only once per frame