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

[eriktorbjorn at users.sourceforge.net]

Revision: 31590
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31590&view=rev
Author:   eriktorbjorn
Date:     2008-04-20 00:44:27 -0700 (Sun, 20 Apr 2008)

Log Message:
-----------
Use correct (I hope) size when loading TLK files. The size field in the AUD
header does not count the size of the header itself. (This fixes a failed
assertion when entering the Pegasus Landing in Kyrandia 3.)

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

Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp	2008-04-20 02:22:08 UTC (rev 31589)
+++ scummvm/trunk/engines/kyra/resource.cpp	2008-04-20 07:44:27 UTC (rev 31590)
@@ -718,7 +718,8 @@
 
 		uint32 curOffset = stream.pos();
 		stream.seek(entry.offset+2, SEEK_SET);
-		entry.size = stream.readUint32LE();
+		// Size of compressed data, plus 8-byte header
+		entry.size = stream.readUint32LE() + 8;
 		stream.seek(curOffset, SEEK_SET);
 
 		files.push_back(FileList::value_type(realFilename, entry));


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