Ticket #1790: 1035739.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;

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;
+                return;
+        }
+
         updatePalette();
 
         switch (effect) {
@@ -3012 +3021 @@
                 memcpy(_scrollBuffer, vs->getPixels(0, 0), vs->h * vs->pitch);
         }
 
-
-        if (_screenEffectFlag && effect != 0) {
+        // TheDig can disable fadeIn(), and may call fadeOut() several times.
+        // Disabling the _screenEffectFlag check forces the screen to get cleared.
+        // This fixes glitches, at least, in the first cutscene when bypassed.
+        if ((_game.id == GID_DIG || _screenEffectFlag) && effect != 0) {
         
                 // Fill screen 0 with black
                 memset(vs->getPixels(0, 0), 0, vs->pitch * vs->h);

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

@@ -2544 +2544 @@
                                         _insane->runScene(insaneVarNum);
                                         _insaneRunning = false;
                                 }
+                                if (_game.id == GID_DIG) {
+                                        _disableFadeInEffect = true;
+                                }
                         }
                         break;
 #endif