Ticket #1790: 1035739-2.diff

scumm/scumm.cpp

@@ -364 +364 @@
         _bgNeedsRedraw = false;
         _screenEffectFlag = false;
         _completeScreenRedraw = false;
+        _disableFadeInEffect = false;
         memset(&_cursor, 0, sizeof(_cursor));
         memset(_grabbedCursor, 0, sizeof(_grabbedCursor));
         _currentCursor = 0;
@@ -1563 +1564 @@
 
         while (!_quit) {
 
-                updatePalette();
-
                 diff -= _system->getMillis();
                 waitForTimer(delta * 15 + diff);
                 diff = _system->getMillis();
@@ -1609 +1608 @@
         // that it will be in a different state each time you run the program.
         _rnd.getRandomNumber(2);
 
+        if (_game.version <= 6) {
+                updatePalette();
+        }
+
 #ifndef DISABLE_HE
         if (_game.heversion >= 90) {
                 ((ScummEngine_v90he *)this)->_moviePlay->handleNextFrame();
@@ -1769 +1772 @@
                 handleMouseOver(oldEgo != VAR(VAR_EGO));
 
                 // Render everything to the screen.
+                if (_game.version >= 7) {
+                        updatePalette();
+                }
                 drawDirtyScreenParts();
 
                 // FIXME / TODO: Try to move the following to scummLoop_handleSound or

scumm/smush/smush_player.cpp

@@ -345 +345 @@
 
         _vm->_fullRedraw = true;
 
-        // WORKAROUND bug #1035739: This is hack to workaround some ugly palette
-        // issues, see the mentioned bug report for details.
-        _vm->_doEffect = false;
-
-
         // HACK HACK HACK: This is an *evil* trick, beware! See above for
         // some explanation.
         _vm->virtscr[0].pitch = _origPitch;
         _vm->gdi._numStrips = _origNumStrips;
 
-
         _initDone = false;
 }
 

scumm/gfx.cpp

@@ -2952 +2952 @@
 #pragma mark -
 
 void ScummEngine::fadeIn(int effect) {
+        if (_disableFadeInEffect) {
+                // fadeIn() calls can be disabled in TheDig after a SMUSH movie
+                // has been played. Like the original interpreter, we introduce
+                // an extra flag to handle this.
+                _disableFadeInEffect = false;
+                _doEffect = false;
+                _screenEffectFlag = true;
+                return;
+        }
+
         updatePalette();
 
         switch (effect) {
@@ -3012 +3022 @@
                 memcpy(_scrollBuffer, vs->getPixels(0, 0), vs->h * vs->pitch);
         }
 
-
-        if (_screenEffectFlag && effect != 0) {
+        // TheDig can disable fadeIn(), and may call fadeOut() several times
+        // successively. Disabling the _screenEffectFlag check forces the screen
+        // to get cleared. This fixes glitches, at least, in the first cutscenes
+        // when bypassed of FT and TheDig.
+        if ((_game.version == 7 || _screenEffectFlag) && effect != 0) {
         
                 // Fill screen 0 with black
                 memset(vs->getPixels(0, 0), 0, vs->pitch * vs->h);
@@ -3112 +3125 @@
                 for (i = 0; i < 16; i++)
                         tab_2[i] += delta[i];
 
-                // Draw the current state to the screen and wait half a sec so the user
-                // can watch the effect taking place.
-                waitForTimer(30);
+                // Draw the current state to the screen and wait a few secs so the
+                // user can watch the effect taking place.
+                waitForTimer(VAR_FADE_DELAY != 0xFF ? VAR(VAR_FADE_DELAY) * 10 : 30);
         }
 }
 

scumm/scumm.h

@@ -976 +976 @@
         //ender: fullscreen
         bool _fullRedraw, _bgNeedsRedraw;
         bool _screenEffectFlag, _completeScreenRedraw;
+        bool _disableFadeInEffect;
 
         struct {
                 int hotspotX, hotspotY, width, height;

scumm/script_v6.cpp

@@ -2535 +2535 @@
                                         else
                                                 sp->play((char *)getStringAddressVar(VAR_VIDEONAME));
                                         delete sp;
+
+                                        if (_game.id == GID_DIG) {
+                                                _disableFadeInEffect = true;
+                                        }
                                 } else if (_game.id == GID_FT) {
                                         const int insaneVarNum = ((_game.features & GF_DEMO) && (_game.platform == Common::kPlatformPC))
                                                 ? 232 : 233;