[Scummvm-cvs-logs] SF.net SVN: scummvm:[34133] scummvm/branches/branch-0-12-0/engines/cine/gfx .cpp

buddha_ at users.sourceforge.net buddha_ at users.sourceforge.net
Mon Aug 25 01:17:18 CEST 2008


Revision: 34133
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34133&view=rev
Author:   buddha_
Date:     2008-08-24 23:17:17 +0000 (Sun, 24 Aug 2008)

Log Message:
-----------
Backport of r34132:
Fix for bug #2055912: FW: incrustSprite fails on savegame loading.
What little testing I did, this seems to work, but more testing
would be nice.

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/engines/cine/gfx.cpp

Modified: scummvm/branches/branch-0-12-0/engines/cine/gfx.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/cine/gfx.cpp	2008-08-24 23:16:37 UTC (rev 34132)
+++ scummvm/branches/branch-0-12-0/engines/cine/gfx.cpp	2008-08-24 23:17:17 UTC (rev 34133)
@@ -198,9 +198,13 @@
 	width = animDataTable[obj.frame]._realWidth;
 	height = animDataTable[obj.frame]._height;
 
-	assert(mask);
-
-	drawSpriteRaw(data, mask, width, height, _background, x, y);
+	// There was an assert(mask) here before but it made savegame loading
+	// in Future Wars sometimes fail the assertion (e.g. see bug #2055912).
+	// Not drawing sprites that have no mask seems to work, but not sure
+	// if this is really a correct way to fix this.
+	if (mask) {
+		drawSpriteRaw(data, mask, width, height, _background, x, y);
+	}
 }
 
 /*! \brief Draw command box on screen


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