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

mthreepwood at users.sourceforge.net mthreepwood at users.sourceforge.net
Sun Jan 3 05:46:00 CET 2010


Revision: 46917
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46917&view=rev
Author:   mthreepwood
Date:     2010-01-03 04:46:00 +0000 (Sun, 03 Jan 2010)

Log Message:
-----------
Fix the GK1 view segfault. szUnpacked was overflowing in SCI32 -- it should be uint32. GK1 now is a bit more playable, with many many glitches.

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

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-01-03 03:37:50 UTC (rev 46916)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-01-03 04:46:00 UTC (rev 46917)
@@ -1430,8 +1430,8 @@
 	// SCI1 volume format:  {bResType wResNumber wPacked+4 wUnpacked wCompression} = 9 bytes
 	// SCI1.1 volume format:  {bResType wResNumber wPacked wUnpacked wCompression} = 9 bytes
 	// SCI32 volume format :  {bResType wResNumber dwPacked dwUnpacked wCompression} = 13 bytes
-	uint16 w, number, szUnpacked;
-	uint32 wCompression;
+	uint16 w, number;
+	uint32 wCompression, szUnpacked;
 	ResourceType type;
 
 	switch (_volVersion) {


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