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

[drmccoy at users.sourceforge.net]

Revision: 28188
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28188&view=rev
Author:   drmccoy
Date:     2007-07-24 21:52:12 -0700 (Tue, 24 Jul 2007)

Log Message:
-----------
Updated loadExtData() for Woodruff. Now the Sierra logo is shown (then it crashes / freezes)

Modified Paths:
--------------
    scummvm/trunk/engines/gob/game.cpp

Modified: scummvm/trunk/engines/gob/game.cpp
===================================================================
--- scummvm/trunk/engines/gob/game.cpp	2007-07-25 00:01:31 UTC (rev 28187)
+++ scummvm/trunk/engines/gob/game.cpp	2007-07-25 04:52:12 UTC (rev 28188)
@@ -140,8 +140,18 @@
 	size = item->size;
 	isPacked = (item->width & 0x8000) != 0;
 
-	if (pResWidth != 0) {
+	if ((pResWidth != 0) && (pResHeight != 0)) {
 		*pResWidth = item->width & 0x7FFF;
+
+		if (*pResWidth & 0x4000)
+			size += 1 << 16;
+		if (*pResWidth & 0x2000)
+			size += 2 << 16;
+		if (*pResWidth & 0x1000)
+			size += 4 << 16;
+
+		*pResWidth &= 0xFFF;
+
 		*pResHeight = item->height;
 		debugC(7, kDebugFileIO, "loadExtData(%d, %d, %d)",
 				itemId, *pResWidth, *pResHeight);


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