diff options
| author | Johannes Schickel | 2008-03-28 01:44:49 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-03-28 01:44:49 +0000 |
| commit | dc1a7004e949a5c1b8936f73387905e0f96f7e5c (patch) | |
| tree | 08e8b7a69f0677f6c9784a08d8d314112271bd21 /engines/kyra | |
| parent | f7d14259c9fa2f366b71118af03b249e6620c716 (diff) | |
| download | scummvm-rg350-dc1a7004e949a5c1b8936f73387905e0f96f7e5c.tar.gz scummvm-rg350-dc1a7004e949a5c1b8936f73387905e0f96f7e5c.tar.bz2 scummvm-rg350-dc1a7004e949a5c1b8936f73387905e0f96f7e5c.zip | |
Fixed showing of cauldron animations processing while the inventory is not shown.
svn-id: r31286
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/timer_v2.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/kyra/timer_v2.cpp b/engines/kyra/timer_v2.cpp index bb0f59978f..994555cc32 100644 --- a/engines/kyra/timer_v2.cpp +++ b/engines/kyra/timer_v2.cpp @@ -51,6 +51,11 @@ void KyraEngine_v2::timerCauldronAnimation(int arg) { debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_v2::timerCauldronAnimation(%d)", arg); int animation = -1; + // HACK: We don't allow inventory animations while the inventory is backed off, which means not shown usually. + // This prevents for example that the cauldron animation is shown in the meanwhile scene with Marco and the Hand in Chapter 2. + if (_inventorySaved) + return; + if (queryGameFlag(2) && _mainCharacter.sceneId != 34 && _mainCharacter.sceneId != 73 && !_invWsa.wsa && !_invWsa.running) { if (animation == -1) animation = _rnd.getRandomNumberRng(1, 6); |