Ticket #8168: cmi-smushtest3.diff

scummvm/scumm/smush/brenderer.h

@@ -36 +36 @@
 private:
         Palette _pal;           //!< The current palette
         char * _data;           //!< The current frame buffer
-        int32 _frame;                   //!< The current frame number
-        int32 _nbframes;                //!< The number of frames in the animation
-        int32 _width;                   //!< The current frame's width
+        int32 _frame;           //!< The current frame number
+        int32 _nbframes;        //!< The number of frames in the animation
+        bool _frameSkip;        //!< The player is skipping frames to catch up
+        int32 _width;           //!< The current frame's width
         int32 _height;          //!< The current frame's height
         const char * _fname;    //!< The filename of the animation being played
 protected:
@@ -54 +55 @@
         void setFrame(int32 f) { _frame = f; }; //!< allows to change the frame number
 public:
         int32 getFrame() const { return _frame; };      //!< accessor for current frame number
+        bool frameSkip() { return _frameSkip; };
+        void setFrameSkip(bool skip) { _frameSkip = skip; };
         BaseRenderer();
         virtual ~BaseRenderer();
 
@@ -76 +79 @@
 protected:
         void save(int32 frame = -1) {};
 public:
-        NullRenderer() {};
+        NullRenderer() { setFrameSkip(false); };
         virtual ~NullRenderer() {};
         bool wait(int32 ms) { return true; };
 };

scummvm/scumm/smush/scumm_renderer.cpp

@@ -243 +243 @@
         // Because waitForTimer() also is the function that checks for user
         // input we always want to call it at least once between frames, or
         // the user may become unable to interrupt the movie.
-        do {
+
+        if (_pending_updates > 0) {
+                _scumm->waitForTimer(0);
+                return true;
+        }
+
+        while (_pending_updates <= 0) {
                 _scumm->waitForTimer(1);
-        } while(_pending_updates <= 0);
+        }
         return true; 
 }
 
@@ -280 +286 @@
         int width = MIN(getWidth(), _scumm->_realWidth); 
         int height = MIN(getHeight(), _scumm->_realHeight);
         
-
         // In theory, this will always be true. In reality, there may be
         // several pending updates because the computer wasn't fast enough to
         // process them all. In that case, skip the frame to catch up.
-        if (--_pending_updates <= 0) {
+
+        if (_pending_updates > 0)
+                _pending_updates--;
+
+        if (!frameSkip() && _pending_updates >= 5) {
+                setFrameSkip(true);
+        } else if (frameSkip() && _pending_updates <= 2) {
+                setFrameSkip(false);
+        }
+
+        if (!frameSkip()) {
                 _scumm->_system->copy_rect((const byte *)data(), getWidth(), 0, 0, width, height);
                 _scumm->_system->update_screen();
         } else {
@@ -298 +313 @@
 }
 
 bool ScummRenderer::update() {
+        // FIXME: Don't increase _pending_updates if the game is paused.
         _pending_updates++;
         return true;
 }