diff options
| author | Johannes Schickel | 2008-03-16 18:24:45 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-03-16 18:24:45 +0000 |
| commit | 18fa238cd34e83a39a7a889f5a3ae928e783df29 (patch) | |
| tree | ab206e3f8590d6c9a1c5129c48ee4807203fd90d /engines/kyra/kyra_v2.cpp | |
| parent | 6444a3c3d858db18d34fcc5b404cd7bc89a7fd59 (diff) | |
| download | scummvm-rg350-18fa238cd34e83a39a7a889f5a3ae928e783df29.tar.gz scummvm-rg350-18fa238cd34e83a39a7a889f5a3ae928e783df29.tar.bz2 scummvm-rg350-18fa238cd34e83a39a7a889f5a3ae928e783df29.zip | |
- implemented skip flag handling in wsa related opcodes
- implemented skip flag handling in o2_isVoicePlaying
- fixed skip flag handling when making the cauldron appear.
svn-id: r31149
Diffstat (limited to 'engines/kyra/kyra_v2.cpp')
| -rw-r--r-- | engines/kyra/kyra_v2.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index d2a578186d..3f2cc3a76d 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -821,7 +821,7 @@ void KyraEngine_v2::delay(uint32 amount, bool updateGame, bool isMainLoop) { updateInput(); } - if (amount > 0 ) + if (amount > 0) _system->delayMillis(amount > 10 ? 10 : amount); } while (!skipFlag() && _system->getMillis() < start + amount && !_quitFlag); } @@ -1763,7 +1763,12 @@ void KyraEngine_v2::loadInvWsa(const char *filename, int run, int delayTime, int if (run) { while (_invWsa.running && !skipFlag() && !_quitFlag) { update(); - //XXX delay? + _system->delayMillis(10); + } + + if (skipFlag()) { + resetSkipFlag(); + displayInvWsaLastFrame(); } } } |