diff options
author | Filippos Karapetis | 2009-07-16 12:43:42 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-07-16 12:43:42 +0000 |
commit | 645e6baa07e71d10b76f3f0fd0950c2e0513a23c (patch) | |
tree | 7ac4fa7b8cda6c2701b9191281aa20fd724cb265 /engines/sci/gfx/res_pal.cpp | |
parent | a6c41a375fd1ae3395b9662207993739388a5ea0 (diff) | |
download | scummvm-rg350-645e6baa07e71d10b76f3f0fd0950c2e0513a23c.tar.gz scummvm-rg350-645e6baa07e71d10b76f3f0fd0950c2e0513a23c.tar.bz2 scummvm-rg350-645e6baa07e71d10b76f3f0fd0950c2e0513a23c.zip |
Added a proper fix for Pepper (the previous one caused regressions in KQ6)
svn-id: r42533
Diffstat (limited to 'engines/sci/gfx/res_pal.cpp')
-rw-r--r-- | engines/sci/gfx/res_pal.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/sci/gfx/res_pal.cpp b/engines/sci/gfx/res_pal.cpp index 97e7297d43..d686220453 100644 --- a/engines/sci/gfx/res_pal.cpp +++ b/engines/sci/gfx/res_pal.cpp @@ -44,6 +44,11 @@ Palette *gfxr_read_pal11(int id, byte *resource, int size) { int entry_size = (format == SCI_PAL_FORMAT_VARIABLE_FLAGS) ? 4 : 3; byte *pal_data = resource + 37; int _colors_nr = READ_LE_UINT16(resource + 29); + + // Happens at the beginning of Pepper + if (_colors_nr > 256) + return NULL; + Palette *retval = new Palette(_colors_nr + start_color); int i; |