aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2013-06-18 23:52:43 +0200
committerStrangerke2013-06-18 23:52:43 +0200
commit8c31fa9cbaf1ede3387416697cf62172ca16fc96 (patch)
treedbecd181028464c8c82b43b78ecf0c60a6265053 /engines
parent233cbb13b8a0f28d63e2a9cacd914024579566d9 (diff)
downloadscummvm-rg350-8c31fa9cbaf1ede3387416697cf62172ca16fc96.tar.gz
scummvm-rg350-8c31fa9cbaf1ede3387416697cf62172ca16fc96.tar.bz2
scummvm-rg350-8c31fa9cbaf1ede3387416697cf62172ca16fc96.zip
HOPKINS: Fix glitch occurring when skipping the flight cut scene.
Thanks Greencis for reporting it
Diffstat (limited to 'engines')
-rw-r--r--engines/hopkins/hopkins.cpp4
-rw-r--r--engines/hopkins/script.cpp1
2 files changed, 5 insertions, 0 deletions
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 5fdcb82243..81dbcabd57 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -1158,6 +1158,7 @@ bool HopkinsEngine::runFull() {
break;
case 34:
+ // In the airport, before the flight cut-scene
_objectsMan->sceneControl("IM34", "IM34", "ANIM34", "IM34", 2, false);
break;
@@ -1188,6 +1189,7 @@ bool HopkinsEngine::runFull() {
}
case 50:
+ // Flight cut scene
playPlaneCutscene();
_globals->_exitId = 51;
break;
@@ -2234,6 +2236,8 @@ void HopkinsEngine::playPlaneCutscene() {
if (!_events->_escKeyFl) {
_graphicsMan->_fadingFl = true;
_animMan->playAnim("PARA00A.ANM", "PARA00.ANM", 9, 9, 9);
+ } else {
+ _graphicsMan->fadeOutShort();
}
_events->_escKeyFl = false;
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index 7868e52be6..3d298b2e9e 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -1980,6 +1980,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
break;
case 216:
+ // Discuss with pilot just before Flight cutscene
_vm->_globals->_introSpeechOffFl = true;
_vm->_talkMan->startAnimatedCharacterDialogue("aviat1.pe2");
_vm->_globals->_introSpeechOffFl = false;