diff options
| author | Paul Gilbert | 2018-07-14 18:25:58 -0700 |
|---|---|---|
| committer | Paul Gilbert | 2018-07-14 18:25:58 -0700 |
| commit | b04fe74f8314d68f57325b3173d0d09cceb58a8a (patch) | |
| tree | 7d9dff80e42ddd9ed7ea775e7ab0e1687c7fdc58 /engines/titanic | |
| parent | 0094b4225c6a18cdc388b4cfc7caf719ea18a796 (diff) | |
| download | scummvm-rg350-b04fe74f8314d68f57325b3173d0d09cceb58a8a.tar.gz scummvm-rg350-b04fe74f8314d68f57325b3173d0d09cceb58a8a.tar.bz2 scummvm-rg350-b04fe74f8314d68f57325b3173d0d09cceb58a8a.zip | |
TITANIC: Fix endless busy cursor in Titania close up
Diffstat (limited to 'engines/titanic')
| -rw-r--r-- | engines/titanic/game/head_slot.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/engines/titanic/game/head_slot.cpp b/engines/titanic/game/head_slot.cpp index f8a65715ad..7028e14659 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); + } } } |