aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorSven Hesse2008-05-17 19:26:10 +0000
committerSven Hesse2008-05-17 19:26:10 +0000
commitec763c4be9f4e780fe6541f66895a0b525cfa637 (patch)
tree2aaf001d0a3a46cf04634cd46eb7f8a8401281a8 /engines
parentad044516cb4a1856486cb50f6bfd866a75df5796 (diff)
downloadscummvm-rg350-ec763c4be9f4e780fe6541f66895a0b525cfa637.tar.gz
scummvm-rg350-ec763c4be9f4e780fe6541f66895a0b525cfa637.tar.bz2
scummvm-rg350-ec763c4be9f4e780fe6541f66895a0b525cfa637.zip
This fixes the messed-up palette after levitating in Bigwig's place in Woodruff.
I hope it doesn't break anything else, though... svn-id: r32159
Diffstat (limited to 'engines')
-rw-r--r--engines/gob/videoplayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index f421646ee2..c6910c1369 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -542,7 +542,7 @@ bool VideoPlayer::doPlay(int16 frame, int16 breakKey,
_vm->_draw->_noInvalidated = true;
}
- if (state.flags & CoktelVideo::kStatePalette) {
+ if ((state.flags & CoktelVideo::kStatePalette) && (palCmd > 1)) {
copyPalette(*(_primaryVideo->getVideo()), palStart, palEnd);
if (!_backSurf)