[Scummvm-cvs-logs] SF.net SVN: scummvm:[49023] scummvm/trunk/engines/sci/graphics/view.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 49023
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49023&view=rev
Author:   m_kiewitz
Date:     2010-05-13 15:39:20 +0000 (Thu, 13 May 2010)

Log Message:
-----------
SCI: adding some more assert()s in view data loading for clone :D

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/view.cpp

Modified: scummvm/trunk/engines/sci/graphics/view.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/view.cpp	2010-05-13 13:32:12 UTC (rev 49022)
+++ scummvm/trunk/engines/sci/graphics/view.cpp	2010-05-13 15:39:20 UTC (rev 49023)
@@ -171,6 +171,7 @@
 		headerSize = READ_LE_UINT16(_resourceData + 0) + 2; // headerSize is not part of the header, so its added
 		assert(headerSize >= 16);
 		_loopCount = _resourceData[2];
+		assert(_loopCount);
 		palOffset = READ_LE_UINT32(_resourceData + 8);
 		// FIXME: After LoopCount there is another byte and its set for view 50 within Laura Bow 2 CD, check what it means
 
@@ -178,6 +179,7 @@
 		loopSize = _resourceData[12];
 		assert(loopSize >= 16);
 		celSize = _resourceData[13];
+		assert(celSize >= 32);
 
 		if (palOffset) {
 			_palette->createFromData(&_resourceData[palOffset], &_viewPalette);
@@ -199,6 +201,7 @@
 			}
 
 			celCount = loopData[2];
+			assert(celCount);
 			_loop[loopNo].celCount = celCount;
 
 			celData = _resourceData + READ_LE_UINT32(loopData + 12);
@@ -208,7 +211,9 @@
 			for (celNo = 0; celNo < celCount; celNo++) {
 				cel = &_loop[loopNo].cel[celNo];
 				cel->width = READ_LE_UINT16(celData);
+				assert(cel->width);
 				cel->height = READ_LE_UINT16(celData + 2);
+				assert(cel->height);
 				cel->displaceX = READ_LE_UINT16(celData + 4);
 				cel->displaceY = READ_LE_UINT16(celData + 6);
 				cel->clearKey = celData[8];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.