aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorSven Hesse2011-01-16 22:28:20 +0000
committerSven Hesse2011-01-16 22:28:20 +0000
commit68ebdf20d5e8ae24029b0e1d7cfa1e3e89e455f9 (patch)
tree31676a02011711287c0941d7ec7f126260f1ee9a /engines
parent199b5d06af044b9a9fa134af62fb248dcc294637 (diff)
downloadscummvm-rg350-68ebdf20d5e8ae24029b0e1d7cfa1e3e89e455f9.tar.gz
scummvm-rg350-68ebdf20d5e8ae24029b0e1d7cfa1e3e89e455f9.tar.bz2
scummvm-rg350-68ebdf20d5e8ae24029b0e1d7cfa1e3e89e455f9.zip
GOB: Don't clobber the global palette
svn-id: r55270
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 4bbb6a55ce..5bd7d08005 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -753,7 +753,7 @@ Graphics::CoktelDecoder *VideoPlayer::openVideo(const Common::String &file, Prop
}
void VideoPlayer::copyPalette(const Video &video, int16 palStart, int16 palEnd) {
- if (!video.decoder->hasPalette())
+ if (!video.decoder->hasPalette() || !video.decoder->isPaletted())
return;
if (palStart < 0)