[Scummvm-git-logs] scummvm master -> b04fe74f8314d68f57325b3173d0d09cceb58a8a

[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:
b04fe74f83 TITANIC: Fix endless busy cursor in Titania close up


Commit: b04fe74f8314d68f57325b3173d0d09cceb58a8a
    https://github.com/scummvm/scummvm/commit/b04fe74f8314d68f57325b3173d0d09cceb58a8a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-07-14T18:25:58-07:00

Commit Message:
TITANIC: Fix endless busy cursor in Titania close up

Changed paths:
    engines/titanic/game/head_slot.cpp


diff --git a/engines/titanic/game/head_slot.cpp b/engines/titanic/game/head_slot.cpp
index f8a6571..7028e14 100644
--- a/engines/titanic/game/head_slot.cpp
+++ b/engines/titanic/game/head_slot.cpp
@@ -23,6 +23,7 @@
 #include "titanic/game/head_slot.h"
 #include "titanic/core/project_item.h"
 #include "titanic/game/brain_slot.h"
+#include "titanic/game_manager.h"
 
 namespace Titanic {
 
@@ -139,11 +140,15 @@ bool CHeadSlot::LoadSuccessMsg(CLoadSuccessMsg *msg) {
 bool CHeadSlot::TimerMsg(CTimerMsg *msg) {
 	if (compareViewNameTo("Titania.Node 15.S") && CBrainSlot::_numAdded == 5
 			&& _occupied) {
-		if (_senseState == "Working" && !_workingFlag) {
-			playMovie(_frameNum2, _frameNum3, 0);
-			_workingFlag = true;
-		} else if (_senseState == "Random") {
-			playMovie(_frameNum2, _frameNum4, 0);
+		// WORKAROUND: Fix original bug where returning to Titania closeup when all the brain slots
+		// were inserted in an incorrect order, would result in endless busy cursor
+		if (getGameManager()->_gameState._mode != GSMODE_CUTSCENE) {
+			if (_senseState == "Working" && !_workingFlag) {
+				playMovie(_frameNum2, _frameNum3, 0);
+				_workingFlag = true;
+			} else if (_senseState == "Random") {
+				playMovie(_frameNum2, _frameNum4, 0);
+			}
 		}
 	}