[Scummvm-cvs-logs] SF.net SVN: scummvm:[55201] scummvm/trunk/engines/cine/gfx.cpp
tdhs at users.sourceforge.net
tdhs at users.sourceforge.net
Tue Jan 11 17:50:26 CET 2011
Revision: 55201
http://scummvm.svn.sourceforge.net/scummvm/?rev=55201&view=rev
Author: tdhs
Date: 2011-01-11 16:50:26 +0000 (Tue, 11 Jan 2011)
Log Message:
-----------
CINE: Fix for Operation Stealth assertion when caught by rat in Scene 8 Rats' Maze.
This converts the assertion on selection of null background into a test and warning.
Modified Paths:
--------------
scummvm/trunk/engines/cine/gfx.cpp
Modified: scummvm/trunk/engines/cine/gfx.cpp
===================================================================
--- scummvm/trunk/engines/cine/gfx.cpp 2011-01-11 03:03:40 UTC (rev 55200)
+++ scummvm/trunk/engines/cine/gfx.cpp 2011-01-11 16:50:26 UTC (rev 55201)
@@ -1429,10 +1429,13 @@
* @param idx Background index
*/
void OSRenderer::selectBg(unsigned int idx) {
- assert(idx < 9 && _bgTable[idx].bg);
- assert(_bgTable[idx].pal.isValid() && !(_bgTable[idx].pal.empty()));
+ assert(idx < 9);
+ if (_bgTable[idx].bg) {
+ assert(_bgTable[idx].pal.isValid() && !(_bgTable[idx].pal.empty()));
_currentBg = idx;
+ } else
+ warning("OSRenderer::selectBg(%d) - attempt to select null background", idx);
reloadPalette();
}
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