[Scummvm-cvs-logs] scummvm master -> d88827b13facfd089707f3a9edd34c8ce112ff20

[lskovlun]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d88827b13f SCI: Fix black screen in LSL7 intro


Commit: d88827b13facfd089707f3a9edd34c8ce112ff20
    https://github.com/scummvm/scummvm/commit/d88827b13facfd089707f3a9edd34c8ce112ff20
Author: Lars Skovlund (lskovlun at sprogklog.dk)
Date: 2011-10-08T03:25:32-07:00

Commit Message:
SCI: Fix black screen in LSL7 intro

Changed paths:
    engines/sci/graphics/frameout.cpp



diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 6bd310f..fcd22de 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -368,7 +368,10 @@ void GfxFrameout::kernelFrameout() {
 			continue;
 		}
 
-		if (it->planeBack)
+		// There is a race condition lurking in SQ6, which causes the game to hang in the intro, when teleporting to Polysorbate LX.
+		// Since I first wrote the patch, the race has stopped occurring for me though.
+		// I'll leave this for investigation later, when someone can reproduce.
+		if (it->pictureId == 0xffff)
 			_paint32->fillRect(it->planeRect, it->planeBack);
 
 		GuiResourceId planeMainPictureId = it->pictureId;