[Scummvm-cvs-logs] scummvm master -> 8c31fa9cbaf1ede3387416697cf62172ca16fc96

[Strangerke]

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:
8c31fa9cba HOPKINS: Fix glitch occurring when skipping the flight cut scene.


Commit: 8c31fa9cbaf1ede3387416697cf62172ca16fc96
    https://github.com/scummvm/scummvm/commit/8c31fa9cbaf1ede3387416697cf62172ca16fc96
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-06-18T14:52:43-07:00

Commit Message:
HOPKINS: Fix glitch occurring when skipping the flight cut scene.

Thanks Greencis for reporting it

Changed paths:
    engines/hopkins/hopkins.cpp
    engines/hopkins/script.cpp



diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 5fdcb82..81dbcab 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 7868e52..3d298b2 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;