aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-03-02 20:05:48 +0100
committerWillem Jan Palenstijn2011-03-02 23:48:57 +0100
commita55179177ed3dff9ebb2ece424b41cc2c18ec9ce (patch)
tree6ae9870f0098610de73871c0022362ff2c6b9d1e /engines
parent719d22918d8058cba68923b4c11b792dbe76f22f (diff)
downloadscummvm-rg350-a55179177ed3dff9ebb2ece424b41cc2c18ec9ce.tar.gz
scummvm-rg350-a55179177ed3dff9ebb2ece424b41cc2c18ec9ce.tar.bz2
scummvm-rg350-a55179177ed3dff9ebb2ece424b41cc2c18ec9ce.zip
Revert "SCI: Fixed bug #3039775 - "KQ4: Graphics glitch [...]""
This reverts commit 74e99328ec0fa43074c52b69d21922407153a1aa. SSCI takes care of this issue in a different manner, which the next commit emulates.
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/graphics/paint16.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp
index 774622476b..4449076fb5 100644
--- a/engines/sci/graphics/paint16.cpp
+++ b/engines/sci/graphics/paint16.cpp
@@ -378,14 +378,14 @@ void GfxPaint16::kernelDrawPicture(GuiResourceId pictureId, int16 animationNr, b
drawPicture(pictureId, animationNr, mirroredFlag, addToFlag, EGApaletteNo);
_transitions->setup(animationNr, animationBlackoutFlag);
} else {
- // The picture window is not in the front, which means that there is a
- // textbox shown above it. We need to invalidate the old picture
- // otherwise it will never be shown by kAnimate. Here are some
- // examples where this occurs:
- // - LSL5 (english) - last wakeup (taj mahal flute dream)
- // - SQ5 (english v1.03) - during the scene following the scrubbing
- // - KQ4 (all versions) - falling off the staircase (bug #3039775)
- _screen->_picNotValid = 1;
+ // We need to set it for SCI1EARLY+ (sierra sci also did so), otherwise we get at least the following issues:
+ // LSL5 (english) - last wakeup (taj mahal flute dream)
+ // SQ5 (english v1.03) - during the scene following the scrubbing
+ // in both situations a window is shown when kDrawPic is called, which would result otherwise in
+ // no showpic getting called from kAnimate and we would get graphic corruption
+ // XMAS1990 EGA did not set it in this case, VGA did
+ if (getSciVersion() >= SCI_VERSION_1_EARLY)
+ _screen->_picNotValid = 1;
_ports->beginUpdate(_ports->_picWind);
drawPicture(pictureId, animationNr, mirroredFlag, addToFlag, EGApaletteNo);
_ports->endUpdate(_ports->_picWind);