From cca5504b6c7e201c024f0823f0ad151eb8a9b061 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Thu, 21 Oct 2010 08:51:10 +0000
Subject: SCUMM: Fix bug #2984000 - SPYFOX3 (French): Crash when using
 fingernail machine.

svn-id: r53669
---
 engines/scumm/he/palette_he.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/scumm/he/palette_he.cpp')

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) {
-- 
cgit v1.2.3