[Scummvm-cvs-logs] SF.net SVN: scummvm:[54773] tools/trunk/engines/mohawk/archive.cpp

[mthreepwood at users.sourceforge.net]

Revision: 54773
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54773&view=rev
Author:   mthreepwood
Date:     2010-12-05 00:43:42 +0000 (Sun, 05 Dec 2010)

Log Message:
-----------
TOOLS: Cleanup Living Books v1 support in extract_mohawk

Modified Paths:
--------------
    tools/trunk/engines/mohawk/archive.cpp

Modified: tools/trunk/engines/mohawk/archive.cpp
===================================================================
--- tools/trunk/engines/mohawk/archive.cpp	2010-12-05 00:36:43 UTC (rev 54772)
+++ tools/trunk/engines/mohawk/archive.cpp	2010-12-05 00:43:42 UTC (rev 54773)
@@ -353,8 +353,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);
 			}
@@ -424,8 +424,6 @@
 		headerTag = stream->readUint32BE();
 		if (headerTag == ID_RSRC)
 			mohawkArchive = new MohawkArchive();
-	} else if (headerTag == ID_LBRC) {
-		printf("Detected Living Books v2 archive - not yet supported!\n");
 	} else if (headerTag == 6 || SWAP_BYTES_32(headerTag) == 6) {
 		// Assume the Living Books v1 archive format
 		mohawkArchive = new LivingBooksArchive_v1();


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