[Scummvm-cvs-logs] scummvm master -> 0d6069e5710714230b243972eeff1003cb0ca70d

dreammaster dreammaster at scummvm.org
Wed Feb 23 09:49:47 CET 2011


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:
0d6069e571 CRUISE: Bugfix for #3188309 - black text at end of introduction


Commit: 0d6069e5710714230b243972eeff1003cb0ca70d
    https://github.com/scummvm/scummvm/commit/0d6069e5710714230b243972eeff1003cb0ca70d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-02-23T00:47:07-08:00

Commit Message:
CRUISE: Bugfix for #3188309 - black text at end of introduction

Changed paths:
    engines/cruise/cruise_main.cpp



diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index 6b487fa..99de66d 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -1889,7 +1889,7 @@ void CruiseEngine::mainLoop() {
 		// FIXME: I suspect that the original game does multiple script executions between game frames; the bug with
 		// Raoul appearing when looking at the book is being there are 3 script iterations separation between the
 		// scene being changed to the book, and the Raoul actor being frozen/disabled. This loop is a hack to ensure
-		// that when a background changes, a few extra script executions are done
+		// that does a few extra script executions for that scene
 		bool bgChanged;
 		int numIterations = 1;
 
@@ -1902,7 +1902,8 @@ void CruiseEngine::mainLoop() {
 			removeFinishedScripts(&relHead);
 			removeFinishedScripts(&procHead);
 
-			if (!bgChanged && backgroundChanged[masterScreen]) {
+			if (!bgChanged && backgroundChanged[masterScreen] &&
+					!strcmp(backgroundTable[0].name, "S06B.PI1")) {
 				bgChanged = true;
 				numIterations += 2;
 			}






More information about the Scummvm-git-logs mailing list