[Scummvm-cvs-logs] scummvm master -> bee65c0b8efa328c0e08b0ec80ac8e1b74f1fbd5
clone2727
clone2727 at gmail.com
Mon Apr 28 02:41:12 CEST 2014
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:
bee65c0b8e PEGASUS: Fix repeated audio analysis video when leaving after defeating Sinclair
Commit: bee65c0b8efa328c0e08b0ec80ac8e1b74f1fbd5
https://github.com/scummvm/scummvm/commit/bee65c0b8efa328c0e08b0ec80ac8e1b74f1fbd5
Author: Keith Kaisershot (keithkaisershot at gmail.com)
Date: 2014-04-27T20:38:57-04:00
Commit Message:
PEGASUS: Fix repeated audio analysis video when leaving after defeating Sinclair
Changed paths:
engines/pegasus/neighborhood/caldoria/caldoria.cpp
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.cpp b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
index 7977c17..709a4fe 100644
--- a/engines/pegasus/neighborhood/caldoria/caldoria.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
@@ -907,7 +907,7 @@ void Caldoria::arriveAtCaldoria49() {
setCurrentAlternate(kAltCaldoriaNormal);
// Need to force the loop to play.
- if (GameState.getCurrentDirection() == kNorth) {
+ if (GameState.getCurrentDirection() == kNorth && !GameState.getCaldoriaSinclairShot()) {
GameState.setCaldoriaFuseTimeLimit(kSinclairShootsTimeLimit);
startExtraSequence(kCa49NorthVoiceAnalysis, kExtraCompletedFlag, kFilterNoInput);
}
More information about the Scummvm-git-logs
mailing list