MOHAWK: Add support for DOS v2 archives (CSWorld Deluxe)

svn-id: r54912

2 files changed, 60 insertions, 2 deletions

diff --git a/engines/mohawk/resource.cpp b/engines/mohawk/resource.cpp
index 2b423ff419..10792ef7db 100644
--- a/engines/mohawk/resource.cpp
+++ b/engines/mohawk/resource.cpp
@@ -473,4 +473,53 @@ int LivingBooksArchive_v1::getIDIndex(int typeIndex, uint16 id) {
 	return -1;	// not found
 }
 
+// Partially based on the Prince of Persia Format Specifications
+// See http://sdfg.com.ar/git/?p=fp-git.git;a=blob;f=FP/doc/FormatSpecifications
+// However, I'm keeping with the terminology we've been using with the
+// later archive formats.
+
+bool DOSArchive_v2::open(Common::SeekableReadStream *stream) {
+	close();
+
+	uint32 typeTableOffset = stream->readUint32LE();
+	uint16 typeTableSize = stream->readUint16LE();
+
+	if (typeTableOffset + typeTableSize != (uint32)stream->size())
+		return false;
+
+	stream->seek(typeTableOffset);
+
+	_typeTable.resource_types = stream->readUint16LE();
+	_types = new OldType[_typeTable.resource_types];
+
+	for (uint16 i = 0; i < _typeTable.resource_types; i++) {
+		_types[i].tag = stream->readUint32LE();
+		_types[i].resource_table_offset = stream->readUint16LE();
+
+		debug(3, "Type[%02d]: Tag = \'%s\'  ResTable Offset = %04x", i, tag2str(_types[i].tag), _types[i].resource_table_offset);
+
+		uint32 oldPos = stream->pos();
+
+		// Resource Table/File Table
+		stream->seek(_types[i].resource_table_offset + typeTableOffset);
+		_types[i].resTable.resources = stream->readUint16LE();
+		_types[i].resTable.entries = new OldType::ResourceTable::Entries[_types[i].resTable.resources];
+
+		for (uint16 j = 0; j < _types[i].resTable.resources; j++) {
+			_types[i].resTable.entries[j].id = stream->readUint16LE();
+			_types[i].resTable.entries[j].offset = stream->readUint32LE() + 1; // Need to add one to the offset to skip the checksum byte
+			_types[i].resTable.entries[j].size = stream->readUint16LE();
+			stream->skip(3); // Skip the useless flags
+
+			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);
+		}
+
+		stream->seek(oldPos);
+		debug (3, "\n");
+	}
+
+	_mhk = stream;
+	return true;
+}
+
 }	// End of namespace Mohawk
diff --git a/engines/mohawk/resource.h b/engines/mohawk/resource.h
index a4f5f56be3..92bf68192f 100644
--- a/engines/mohawk/resource.h
+++ b/engines/mohawk/resource.h
@@ -214,13 +214,13 @@ public:
 
 	bool hasResource(uint32 tag, uint16 id);
 	bool hasResource(uint32 tag, const Common::String &resName) { return false; }
-	bool open(Common::SeekableReadStream *stream);
+	virtual bool open(Common::SeekableReadStream *stream);
 	Common::SeekableReadStream *getResource(uint32 tag, uint16 id);
 	Common::SeekableReadStream *getResource(uint32 tag, const Common::String &resName) { return 0; }
 	uint32 getOffset(uint32 tag, uint16 id);
 	uint16 findResourceID(uint32 type, const Common::String &resName) { return 0xFFFF; }
 
-private:
+protected:
 	struct OldType {
 		uint32 tag;
 		uint16 resource_table_offset;
@@ -234,10 +234,19 @@ private:
 		} resTable;
 	} *_types;
 
+private:
 	int getTypeIndex(uint32 tag);
 	int getIDIndex(int typeIndex, uint16 id);
 };
 
+class DOSArchive_v2 : public LivingBooksArchive_v1 {
+public:
+	DOSArchive_v2() : LivingBooksArchive_v1() {}
+	~DOSArchive_v2() {}
+
+	virtual bool open(Common::SeekableReadStream *stream);
+};
+
 } // End of namespace Mohawk
 
 #endif