diff options
| author | Johannes Schickel | 2006-03-13 17:19:19 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-03-13 17:19:19 +0000 |
| commit | ccd0a09f7a1fa4c0d820244b5f99b1e835b22af8 (patch) | |
| tree | 2dd6e8ba67aa0527922391d5105415a7b7b74cf2 /engines/kyra | |
| parent | 9399a2b58e98de3796d8640c25def3ffaa48d8dc (diff) | |
| download | scummvm-rg350-ccd0a09f7a1fa4c0d820244b5f99b1e835b22af8.tar.gz scummvm-rg350-ccd0a09f7a1fa4c0d820244b5f99b1e835b22af8.tar.bz2 scummvm-rg350-ccd0a09f7a1fa4c0d820244b5f99b1e835b22af8.zip | |
- Fixed regression when moving waitTicks to delay (removes wrongly drawn shapes and wrongly call of the kyragame fading in the outro)
- Removes a new line from a warning in seqplayer.cpp
svn-id: r21263
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/kyra.cpp | 5 | ||||
| -rw-r--r-- | engines/kyra/seqplayer.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp index 97644c0262..25b68fab1a 100644 --- a/engines/kyra/kyra.cpp +++ b/engines/kyra/kyra.cpp @@ -785,11 +785,12 @@ void KyraEngine::delay(uint32 amount, bool update, bool isMainLoop) { if (_debugger->isAttached()) _debugger->onFrame(); - if (update) + if (update) { _sprites->updateSceneAnims(); _animator->updateAllObjectShapes(); + } - if (_currentCharacter && _currentCharacter->sceneId == 210) { + if (_currentCharacter && _currentCharacter->sceneId == 210 && update) { updateKyragemFading(); } diff --git a/engines/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp index 51fa53a518..3233afcd58 100644 --- a/engines/kyra/seqplayer.cpp +++ b/engines/kyra/seqplayer.cpp @@ -225,7 +225,7 @@ void SeqPlayer::s1_loopInc() { void SeqPlayer::s1_skip() { uint8 a = *_seqData++; - warning("STUB: s1_skip(%d)\n", a); + warning("STUB: s1_skip(%d)", a); } void SeqPlayer::s1_loadPalette() { |