[Scummvm-cvs-logs] scummvm master -> dae9fbd9e6075b3daad6bd1ea384b4831850c6e3

[bluegr]

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:
dae9fbd9e6 SAGA: Fixed script bug #3358007 - "IHNM: Freeze when exiting from the motor room's right door"


Commit: dae9fbd9e6075b3daad6bd1ea384b4831850c6e3
    https://github.com/scummvm/scummvm/commit/dae9fbd9e6075b3daad6bd1ea384b4831850c6e3
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-10-03T15:56:10-07:00

Commit Message:
SAGA: Fixed script bug #3358007 - "IHNM: Freeze when exiting from the motor room's right door"

Thanks to digital for finding the actual script bug

Changed paths:
    engines/saga/script.cpp



diff --git a/engines/saga/script.cpp b/engines/saga/script.cpp
index f4902b6..96746b5 100644
--- a/engines/saga/script.cpp
+++ b/engines/saga/script.cpp
@@ -26,6 +26,7 @@
 #include "saga/gfx.h"
 #include "saga/console.h"
 
+#include "saga/animation.h"
 #include "saga/script.h"
 #include "saga/interface.h"
 #include "saga/itedata.h"
@@ -941,6 +942,18 @@ void Script::opSpeak(SCRIPTOP_PARAMS) {
 		return;
 	}
 
+#ifdef ENABLE_IHNM
+	// WORKAROUND for script bug #3358007 in IHNM. When the zeppelin is landing
+	// and the player attempts to exit from the right door in room 13, the game
+	// scripts change to scene 5, but do not clear the cutaway that appears
+	// before Gorrister's speech starts, resulting in a deadlock. We do this
+	// manually here.
+	if (_vm->getGameId() == GID_IHNM && _vm->_scene->currentChapterNumber() == 1 && 
+		_vm->_scene->currentSceneNumber() == 5 && _vm->_anim->hasCutaway()) {
+		_vm->_anim->returnFromCutaway();
+	}
+#endif
+
 	int stringsCount = scriptS->readByte();
 	uint16 actorId = scriptS->readUint16LE();
 	uint16 speechFlags = scriptS->readByte();