[Scummvm-cvs-logs] SF.net SVN: scummvm:[42552] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 42552
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42552&view=rev
Author:   drmccoy
Date:     2009-07-17 00:55:56 +0000 (Fri, 17 Jul 2009)

Log Message:
-----------
Making TOTResourceItem::size unsigned, fixing a graphics bug that crept in

Modified Paths:
--------------
    scummvm/trunk/engines/gob/resources.cpp
    scummvm/trunk/engines/gob/resources.h

Modified: scummvm/trunk/engines/gob/resources.cpp
===================================================================
--- scummvm/trunk/engines/gob/resources.cpp	2009-07-17 00:55:42 UTC (rev 42551)
+++ scummvm/trunk/engines/gob/resources.cpp	2009-07-17 00:55:56 UTC (rev 42552)
@@ -255,7 +255,7 @@
 		TOTResourceItem &item = _totResourceTable->items[i];
 
 		item.offset = stream->readSint32LE();
-		item.size   = stream->readSint16LE();
+		item.size   = stream->readUint16LE();
 		item.width  = stream->readSint16LE();
 		item.height = stream->readSint16LE();
 
@@ -645,7 +645,7 @@
 }
 
 byte *Resources::getTOTData(TOTResourceItem &totItem) const {
-	if (totItem.size < 0)
+	if (totItem.size == 0)
 		return 0;
 
 	int32 offset = _totResourceTable->dataOffset + totItem.offset - _totResStart;
@@ -657,7 +657,7 @@
 }
 
 byte *Resources::getIMData(TOTResourceItem &totItem) const {
-	if (totItem.size < 0)
+	if (totItem.size == 0)
 		return 0;
 
 	int32 indexOffset = totItem.index * 4;

Modified: scummvm/trunk/engines/gob/resources.h
===================================================================
--- scummvm/trunk/engines/gob/resources.h	2009-07-17 00:55:42 UTC (rev 42551)
+++ scummvm/trunk/engines/gob/resources.h	2009-07-17 00:55:56 UTC (rev 42552)
@@ -109,7 +109,7 @@
 
 	struct TOTResourceItem {
 		ResourceType type;
-		int16 size;
+		uint16 size;
 		int16 width;
 		int16 height;
 		union {


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