diff options
| author | Johannes Schickel | 2008-03-16 13:31:18 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-03-16 13:31:18 +0000 |
| commit | 2a95c653ebccc354cdda601f61b63eb2a48216f5 (patch) | |
| tree | 159df2053eb988bf5f7b81fc4cfc00a620fc7c8c /engines/kyra/kyra_v2.cpp | |
| parent | bbecd439c12181fd5efdc33bf514d37559f1fd89 (diff) | |
| download | scummvm-rg350-2a95c653ebccc354cdda601f61b63eb2a48216f5.tar.gz scummvm-rg350-2a95c653ebccc354cdda601f61b63eb2a48216f5.tar.bz2 scummvm-rg350-2a95c653ebccc354cdda601f61b63eb2a48216f5.zip | |
- Impelemented opcode 155: o2_stopSceneAnimation
- fixed crash while switching chapters
svn-id: r31139
Diffstat (limited to 'engines/kyra/kyra_v2.cpp')
| -rw-r--r-- | engines/kyra/kyra_v2.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 295c917c83..12743311d2 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -799,10 +799,8 @@ void KyraEngine_v2::delay(uint32 amount, bool updateGame, bool isMainLoop) { update(); } - if (amount > 0 ) _system->delayMillis(amount > 10 ? 10 : amount); - } while (!_skipFlag && _system->getMillis() < start + amount && !_quitFlag); } @@ -2275,7 +2273,7 @@ void KyraEngine_v2::setupOpcodeTable() { Opcode(o2_customChat), Opcode(o2_customChatFinish), OpcodeUnImpl(), - OpcodeUnImpl(), + Opcode(o2_stopSceneAnimation), // 0x9c OpcodeUnImpl(), OpcodeUnImpl(), |