Skip to content

Commit

Permalink
BLADERUNNER: Fix flash back to game between end outtake and credits
Browse files Browse the repository at this point in the history
Between an ending outtake and the end credits the game did a quick flash back to the game scene
  • Loading branch information
antoniou79 committed Apr 2, 2019
1 parent 27e6a28 commit a7f2d26
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
7 changes: 6 additions & 1 deletion engines/bladerunner/bladerunner.cpp
Expand Up @@ -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);
}

Expand Down
8 changes: 4 additions & 4 deletions engines/bladerunner/script/ai/clovis.cpp
Expand Up @@ -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;

Expand Down

0 comments on commit a7f2d26

Please sign in to comment.