[Scummvm-cvs-logs] SF.net SVN: scummvm:[50006] scummvm/trunk/engines/sci/resource.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 50006
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50006&view=rev
Author:   m_kiewitz
Date:     2010-06-18 05:40:12 +0000 (Fri, 18 Jun 2010)

Log Message:
-----------
SCI: reverting #49978, it worked correctly. the new values contain the full height/width of the picture (may be much larger cause of scrollable areas) and we actually don't want that. the values before and now contain the height/width of the on-screen picture size - although this may contain 0, 0 for low-res games, but that's fine then

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-06-18 02:36:45 UTC (rev 50005)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-06-18 05:40:12 UTC (rev 50006)
@@ -1909,8 +1909,8 @@
 		if (res) {
 			if (READ_LE_UINT16(res->data) == 0x0e) {
 				// SCI32 picture
-				uint16 width = READ_LE_UINT16(res->data + 14);
-				uint16 height = READ_LE_UINT16(res->data + 16);
+				uint16 width = READ_LE_UINT16(res->data + 10);
+				uint16 height = READ_LE_UINT16(res->data + 12);
 				if ((width == 320) && ((height == 190) || (height == 200)))
 					return false;
 				if ((width >= 600) || (height >= 400))


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