[Scummvm-git-logs] scummvm master -> a7f2d26831a41471cada03e96c7039abc901caf8

[antoniou79]

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:
a7f2d26831 BLADERUNNER: Fix flash back to game between end outtake and credits


Commit: a7f2d26831a41471cada03e96c7039abc901caf8
    https://github.com/scummvm/scummvm/commit/a7f2d26831a41471cada03e96c7039abc901caf8
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-04-02T19:32:16+03:00

Commit Message:
BLADERUNNER: Fix flash back to game between end outtake and credits

Between an ending outtake and the end credits the game did a quick flash back to the game scene

Changed paths:
    engines/bladerunner/bladerunner.cpp
    engines/bladerunner/script/ai/clovis.cpp


diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index ce96fe9..911a46a 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -989,7 +989,12 @@ void BladeRunnerEngine::gameTick() {
 
 	_subtitles->tick(_surfaceFront);
 
-	blitToScreen(_surfaceFront);
+	 // Without this condition the game may flash back to the game screen
+	 // between and ending outtake and the end credits.
+	if (!_gameOver) {
+		blitToScreen(_surfaceFront);
+	}
+
 	_system->delayMillis(10);
 }
 
diff --git a/engines/bladerunner/script/ai/clovis.cpp b/engines/bladerunner/script/ai/clovis.cpp
index 9557bbb..eba72e3 100644
--- a/engines/bladerunner/script/ai/clovis.cpp
+++ b/engines/bladerunner/script/ai/clovis.cpp
@@ -439,17 +439,17 @@ bool AIScriptClovis::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Actor_Says(kActorClovis, 1310, kAnimationModeTalk);
 		Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
 		Ambient_Sounds_Remove_All_Looping_Sounds(1);
-		Outtake_Play(kOuttakeEnd4A, 0, -1);
+		Outtake_Play(kOuttakeEnd4A, false, -1);
 		if (Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsLucy
 		 && Game_Flag_Query(kFlagLucyIsReplicant)
 		) {
-			Outtake_Play(kOuttakeEnd4B, 0, -1);
+			Outtake_Play(kOuttakeEnd4B, false, -1);
 		} else if (Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsDektora
 		       && Game_Flag_Query(kFlagDektoraIsReplicant)
 		) {
-			Outtake_Play(kOuttakeEnd4C, 0, -1);
+			Outtake_Play(kOuttakeEnd4C, false, -1);
 		}
-		Outtake_Play(kOuttakeEnd4D, 0, -1);
+		Outtake_Play(kOuttakeEnd4D, false, -1);
 		Game_Over();
 		return true;