[Scummvm-cvs-logs] SF.net SVN: scummvm:[54397] scummvm/trunk/engines/mohawk

[mthreepwood at users.sourceforge.net]

Revision: 54397
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54397&view=rev
Author:   mthreepwood
Date:     2010-11-21 00:02:25 +0000 (Sun, 21 Nov 2010)

Log Message:
-----------
MOHAWK: Fix Living Books v1 sound (courtesy of fuzzie)

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/resource.cpp
    scummvm/trunk/engines/mohawk/sound.cpp

Modified: scummvm/trunk/engines/mohawk/resource.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/resource.cpp	2010-11-20 23:53:14 UTC (rev 54396)
+++ scummvm/trunk/engines/mohawk/resource.cpp	2010-11-21 00:02:25 UTC (rev 54397)
@@ -376,8 +376,8 @@
 			for (uint16 j = 0; j < _types[i].resTable.resources; j++) {
 				_types[i].resTable.entries[j].id = _mhk->readUint16LE();
 				_types[i].resTable.entries[j].offset = _mhk->readUint32LE();
-				_types[i].resTable.entries[j].size = _mhk->readUint16LE();
-				_mhk->readUint32LE(); // Unknown (always 0?)
+				_types[i].resTable.entries[j].size = _mhk->readUint32LE();
+				_mhk->readUint16LE(); // Unknown (always 0?)
 
 				debug (4, "Entry[%02x]: ID = %04x (%d)\tOffset = %08x, Size = %08x", j, _types[i].resTable.entries[j].id, _types[i].resTable.entries[j].id, _types[i].resTable.entries[j].offset, _types[i].resTable.entries[j].size);
 			}

Modified: scummvm/trunk/engines/mohawk/sound.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/sound.cpp	2010-11-20 23:53:14 UTC (rev 54396)
+++ scummvm/trunk/engines/mohawk/sound.cpp	2010-11-21 00:02:25 UTC (rev 54397)
@@ -462,11 +462,12 @@
 
 	if (header == 'Wv') { // Big Endian
 		rate = stream->readUint16BE();
-		stream->skip(10); // Loop chunk, like the newer format?
+		stream->skip(10); // Unknown
 		size = stream->readUint32BE();
 	} else if (header == 'vW') { // Little Endian
+		stream->readUint16LE(); // Unknown
 		rate = stream->readUint16LE();
-		stream->skip(10); // Loop chunk, like the newer format?
+		stream->skip(8); // Unknown
 		size = stream->readUint32LE();
 	} else
 		error("Could not find Old Mohawk Sound header");


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