[Scummvm-cvs-logs] scummvm master -> 9eb342615c4cdbc1f38374b9a7808dc54bfb7ad9

[dreammaster]

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:
9eb342615c MADS: Fix frequently getting endless wait cursor after doctor hits you


Commit: 9eb342615c4cdbc1f38374b9a7808dc54bfb7ad9
    https://github.com/scummvm/scummvm/commit/9eb342615c4cdbc1f38374b9a7808dc54bfb7ad9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-03-14T18:34:26-04:00

Commit Message:
MADS: Fix frequently getting endless wait cursor after doctor hits you

Changed paths:
    engines/mads/nebular/nebular_scenes3.cpp



diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 383f5b5..4e7781e 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -3313,7 +3313,7 @@ void Scene319::step() {
 
 	switch (_game._trigger) {
 	case 70:
-	case 71:
+	case 71: {
 		_animMode = 1;
 		_nextAction1 = _nextAction2;
 		_animFrame = 0;
@@ -3336,7 +3336,14 @@ void Scene319::step() {
 			_scene->_sequences.updateTimeout(_globals._sequenceIndexes[i], oldIdx);
 		}
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[0], SEQUENCE_TRIGGER_EXPIRE, 0, 74);
+
+		// WORKAROUND: This fixes the game sometimes going into an endless waiting
+		// loop even after the doctor has finished hitting Rex. Note sure if it's due
+		// to a bug in room script or in the engine, but this at least fixes it
+		int seqIndex = _scene->_sequences.findByTrigger(2);
+		_scene->_sequences[seqIndex]._doneFlag = false;
 		break;
+	}
 
 	case 72:
 		_vm->_palette->setColorFlags(0xFF, 0, 0);