[Scummvm-cvs-logs] SF.net SVN: scummvm:[52911] scummvm/trunk/engines/sci/graphics/paint16.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 52911
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52911&view=rev
Author:   m_kiewitz
Date:     2010-09-26 15:47:13 +0000 (Sun, 26 Sep 2010)

Log Message:
-----------
SCI: kDrawPic setting _picNotValid on non-front

fixes lsl5 english graphic corruption during taj mahal wakeup, should also fix sq5 1.03 graphic corruption right after scrubbing (bug #3041069)

save for backporting

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/paint16.cpp

Modified: scummvm/trunk/engines/sci/graphics/paint16.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/paint16.cpp	2010-09-26 15:46:25 UTC (rev 52910)
+++ scummvm/trunk/engines/sci/graphics/paint16.cpp	2010-09-26 15:47:13 UTC (rev 52911)
@@ -380,6 +380,14 @@
 		drawPicture(pictureId, animationNr, mirroredFlag, addToFlag, EGApaletteNo);
 		_transitions->setup(animationNr, animationBlackoutFlag);
 	} else {
+		// 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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.