aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMatthew Hoops2012-09-09 17:20:07 -0400
committerMatthew Hoops2012-09-09 17:20:07 -0400
commited2be9d873cb69d2f06f38665342082e4ec157d0 (patch)
treeb34da680f7af7877d5f5c1bdd3a9b42865f62b6e /engines
parentafcc8ecddc35f59d9c999dc3904a6259a2126c7e (diff)
downloadscummvm-rg350-ed2be9d873cb69d2f06f38665342082e4ec157d0.tar.gz
scummvm-rg350-ed2be9d873cb69d2f06f38665342082e4ec157d0.tar.bz2
scummvm-rg350-ed2be9d873cb69d2f06f38665342082e4ec157d0.zip
GRAPHICS: Fix ImageDecoder inconsistency with getPalette()
Per LordHoto's suggestion
Diffstat (limited to 'engines')
-rw-r--r--engines/mohawk/bitmap.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/mohawk/bitmap.cpp b/engines/mohawk/bitmap.cpp
index 952b6daec2..65a697c579 100644
--- a/engines/mohawk/bitmap.cpp
+++ b/engines/mohawk/bitmap.cpp
@@ -652,10 +652,10 @@ MohawkSurface *MystBitmap::decodeImage(Common::SeekableReadStream* stream) {
}
// Copy the palette to one of our own
- const byte *palette = bitmapDecoder.getPalette();
byte *newPal = 0;
- if (palette) {
+ if (bitmapDecoder.hasPalette()) {
+ const byte *palette = bitmapDecoder.getPalette();
newPal = (byte *)malloc(256 * 3);
memcpy(newPal, palette, 256 * 3);
}