[Scummvm-cvs-logs] SF.net SVN: scummvm:[53670] scummvm/branches/branch-1-2-0/engines/scumm/he/ palette_he.cpp
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Thu Oct 21 10:55:17 CEST 2010
Revision: 53670
http://scummvm.svn.sourceforge.net/scummvm/?rev=53670&view=rev
Author: Kirben
Date: 2010-10-21 08:55:16 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
SCUMM: Backport fix for bug #2984000 - SPYFOX3 (French): Crash when using fingernail machine.
Modified Paths:
--------------
scummvm/branches/branch-1-2-0/engines/scumm/he/palette_he.cpp
Modified: scummvm/branches/branch-1-2-0/engines/scumm/he/palette_he.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/scumm/he/palette_he.cpp 2010-10-21 08:51:10 UTC (rev 53669)
+++ scummvm/branches/branch-1-2-0/engines/scumm/he/palette_he.cpp 2010-10-21 08:55:16 UTC (rev 53670)
@@ -203,8 +203,8 @@
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) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list