aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-09-18 12:38:11 +0000
committerJohannes Schickel2009-09-18 12:38:11 +0000
commit39b071bed5fca53ff5dadb85c90ad4e1ea08e971 (patch)
tree38ba1589cff76a11aca38b1399435f39360b661e
parente4fd4e827ca95733e29114ee955b5dd4a26cb16f (diff)
downloadscummvm-rg350-39b071bed5fca53ff5dadb85c90ad4e1ea08e971.tar.gz
scummvm-rg350-39b071bed5fca53ff5dadb85c90ad4e1ea08e971.tar.bz2
scummvm-rg350-39b071bed5fca53ff5dadb85c90ad4e1ea08e971.zip
Call updateScreen after setScreenPalette in olol_restoreMagicShroud, so that the palette is updated correctly.
svn-id: r44182
-rw-r--r--engines/kyra/script_lol.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp
index 7c00e6971c..956143106d 100644
--- a/engines/kyra/script_lol.cpp
+++ b/engines/kyra/script_lol.cpp
@@ -2192,8 +2192,8 @@ int LoLEngine::olol_restoreMagicShroud(EMCState *script) {
for (int i = 0; i < 21; i++) {
uint32 etime = _system->getMillis() + 20 * _tickLength;
mov->displayFrame(i, 0, 0, 0, 0, 0, 0);
- _screen->updateScreen();
_screen->setScreenPalette(**tpal3++);
+ _screen->updateScreen();
if (i == 2 || i == 5 || i == 8 || i == 11 || i == 13 || i == 15 || i == 17 || i == 19)
snd_playSoundEffect(95, -1);
@@ -2207,11 +2207,11 @@ int LoLEngine::olol_restoreMagicShroud(EMCState *script) {
for (int i = 22; i < 38; i++) {
uint32 etime = _system->getMillis() + 12 * _tickLength;
mov->displayFrame(i, 0, 0, 0, 0, 0, 0);
- _screen->updateScreen();
if (i == 22 || i == 24 || i == 28 || i == 32) {
snd_playSoundEffect(131, -1);
_screen->setScreenPalette(**tpal3++);
}
+ _screen->updateScreen();
delayUntil(etime);
}