diff options
| author | Paul Gilbert | 2012-10-31 09:34:38 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2012-10-31 09:34:38 +1100 |
| commit | 798ddfaab500bb212f620cf095328eee5eb140a4 (patch) | |
| tree | 55b5d0b90affd88063c04b7ff62fea1616b83e80 /engines/toon/picture.cpp | |
| parent | ef663f95a516d8fe47a245653d418c047361281a (diff) | |
| parent | fdc80fd952120ecb8a4941edd4c2e404cdc5fa33 (diff) | |
| download | scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.tar.gz scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.tar.bz2 scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.zip | |
Merge branch 'master' into hopkins
Diffstat (limited to 'engines/toon/picture.cpp')
| -rw-r--r-- | engines/toon/picture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/toon/picture.cpp b/engines/toon/picture.cpp index 204b0fe576..f59cdca064 100644 --- a/engines/toon/picture.cpp +++ b/engines/toon/picture.cpp @@ -71,7 +71,7 @@ bool Picture::loadPicture(const Common::String &file) { _data = new uint8[decSize + 100]; _paletteEntries = READ_LE_UINT16(fileData + 14) / 3; _useFullPalette = (_paletteEntries == 256); - + if (_paletteEntries) { _palette = new uint8[_paletteEntries * 3]; memcpy(_palette, fileData + 16, _paletteEntries * 3); |