[Scummvm-cvs-logs] SF.net SVN: scummvm:[52295] scummvm/trunk/engines/scumm/gfx.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Aug 23 12:00:19 CEST 2010


Revision: 52295
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52295&view=rev
Author:   fingolfin
Date:     2010-08-23 10:00:19 +0000 (Mon, 23 Aug 2010)

Log Message:
-----------
SCUMM: cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/gfx.cpp

Modified: scummvm/trunk/engines/scumm/gfx.cpp
===================================================================
--- scummvm/trunk/engines/scumm/gfx.cpp	2010-08-23 08:29:16 UTC (rev 52294)
+++ scummvm/trunk/engines/scumm/gfx.cpp	2010-08-23 10:00:19 UTC (rev 52295)
@@ -1794,18 +1794,16 @@
 		if (stripnr * 2 + 2 < smapLen) {
 			offset = READ_LE_UINT16(smap_ptr + stripnr * 2 + 2);
 		}
-		assertRange(0, offset, smapLen-1, "screen strip");
 	} else if (_vm->_game.features & GF_SMALL_HEADER) {
 		smapLen = READ_LE_UINT32(smap_ptr);
 		if (stripnr * 4 + 4 < smapLen)
 			offset = READ_LE_UINT32(smap_ptr + stripnr * 4 + 4);
-		assertRange(0, offset, smapLen-1, "screen strip");
 	} else {
 		smapLen = READ_BE_UINT32(smap_ptr);
 		if (stripnr * 4 + 8 < smapLen)
 			offset = READ_LE_UINT32(smap_ptr + stripnr * 4 + 8);
-		assertRange(0, offset, smapLen-1, "screen strip");
 	}
+	assertRange(0, offset, smapLen-1, "screen strip");
 
 	return decompressBitmap(dstPtr, vs->pitch, smap_ptr + offset, height);
 }


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