diff options
| author | Travis Howell | 2010-10-21 08:51:10 +0000 |
|---|---|---|
| committer | Travis Howell | 2010-10-21 08:51:10 +0000 |
| commit | cca5504b6c7e201c024f0823f0ad151eb8a9b061 (patch) | |
| tree | ea92667e288f93d86fa9eced2a9f95092d5575d1 /engines/scumm/he/palette_he.cpp | |
| parent | 787bafc442fb82640441982c8069b3816381c7f1 (diff) | |
| download | scummvm-rg350-cca5504b6c7e201c024f0823f0ad151eb8a9b061.tar.gz scummvm-rg350-cca5504b6c7e201c024f0823f0ad151eb8a9b061.tar.bz2 scummvm-rg350-cca5504b6c7e201c024f0823f0ad151eb8a9b061.zip | |
SCUMM: Fix bug #2984000 - SPYFOX3 (French): Crash when using fingernail machine.
svn-id: r53669
Diffstat (limited to 'engines/scumm/he/palette_he.cpp')
| -rw-r--r-- | engines/scumm/he/palette_he.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/he/palette_he.cpp b/engines/scumm/he/palette_he.cpp index 6ef68d981e..ad3f90b8eb 100644 --- a/engines/scumm/he/palette_he.cpp +++ b/engines/scumm/he/palette_he.cpp @@ -203,8 +203,8 @@ void ScummEngine_v90he::setHEPaletteFromImage(int palSlot, int resId, int state) uint8 *data = getResourceAddress(rtImage, resId); assert(data); const uint8 *rgbs = findWrappedBlock(MKID_BE('RGBS'), data, state, 0); - assert(rgbs); - setHEPaletteFromPtr(palSlot, rgbs); + if (rgbs) + setHEPaletteFromPtr(palSlot, rgbs); } void ScummEngine_v90he::setHEPaletteFromRoom(int palSlot, int resId, int state) { |