From 832160f00f61dd1c6db9f53527b994523aefc8b3 Mon Sep 17 00:00:00 2001
From: n-a-c-h <>
Date: Tue, 7 Mar 2006 23:06:21 +0000
Subject: [PATCH] Movie related actions now set frame skip to 0, and restores
 original settings when done.

---
 zsnes/src/zmovie.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/zsnes/src/zmovie.c b/zsnes/src/zmovie.c
index fa104ab6..86f54e74 100644
--- a/zsnes/src/zmovie.c
+++ b/zsnes/src/zmovie.c
@@ -2376,6 +2376,11 @@ static void OldMovieReplay()
   }
 }
 
+extern unsigned char frameskip;
+extern unsigned char maxskip;
+static unsigned char oldframeskip = 0;
+static unsigned char oldmaxskip = 0;
+
 static void OldMoviePlay(FILE *fp)
 {
   unsigned char RecData[16];
@@ -2423,6 +2428,11 @@ static void OldMoviePlay(FILE *fp)
     DSPMem[0x78] = 0;
 
     Msgptr = "OLD MOVIE REPLAYING.";
+
+    oldframeskip = frameskip;
+    oldmaxskip = maxskip;
+    frameskip = 0;
+    maxskip = 0;
   }
   else
   {
@@ -2617,6 +2627,9 @@ void MovieStop()
     SRAMState = PrevSRAMState;
   }
   MovieWaiting = false;
+
+  frameskip = oldframeskip;
+  maxskip = oldmaxskip;
 }
 
 void MoviePlay()
@@ -2654,6 +2667,11 @@ void MoviePlay()
           if (isdigit(CMovieExt)) { fnamest[fname_len] = CMovieExt; }
           MovieSub_Open(fnamest+1);
           MessageOn = MsgCount;
+
+          oldframeskip = frameskip;
+          oldmaxskip = maxskip;
+          frameskip = 0;
+          maxskip = 0;
         }
         else
         {
@@ -2713,6 +2731,11 @@ void MovieRecord()
       zmv_alloc_rewind_buffer(AllocatedRewindStates);
       Msgptr = "MOVIE RECORDING.";
       MessageOn = MsgCount;
+
+      oldframeskip = frameskip;
+      oldmaxskip = maxskip;
+      frameskip = 0;
+      maxskip = 0;
     }
     else
     {