From bb131aaa072d1d75e7d1c0a5f6f0ef3614fc8eb7 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Fri, 27 Jul 2012 00:05:15 +0200
Subject: WINTERMUTE: Clean up some TODOs.

---
 engines/wintermute/base/file/base_file_entry.cpp |  8 +++-----
 engines/wintermute/base/file/base_package.cpp    | 18 ++++++++++++++++++
 engines/wintermute/base/file/dcpackage.h         | 20 ++------------------
 3 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'engines/wintermute/base/file')

diff --git a/engines/wintermute/base/file/base_file_entry.cpp b/engines/wintermute/base/file/base_file_entry.cpp
index 7bf635b858..da1bfa7ac8 100644
--- a/engines/wintermute/base/file/base_file_entry.cpp
+++ b/engines/wintermute/base/file/base_file_entry.cpp
@@ -65,18 +65,16 @@ Common::SeekableReadStream *BaseFileEntry::createReadStream() const {
 		return NULL;
 	}
 
-	// TODO: Cleanup
+
 	bool compressed = (_compressedLength != 0);
-	/* _size = fileEntry->_length; */
 
 	if (compressed) {
-		// TODO: Really, most of this logic might be doable directly in the fileEntry?
-		// But for now, this should get us rolling atleast.
 		file = Common::wrapCompressedReadStream(new Common::SeekableSubReadStream(file, _offset, _offset + _length, DisposeAfterUse::YES));
+		// file = Common::wrapCompressedReadStream(new Common::SeekableSubReadStream(file, _offset, _offset + _length, DisposeAfterUse::YES), _length); // TODO: Uncomment on merge
 	} else {
 		file = new Common::SeekableSubReadStream(file, _offset, _offset + _length, DisposeAfterUse::YES);
 	}
-	if (file->size() == 0) {
+	if (file->size() == 0) {	// TODO: Cleanup on next merge (CBPkgFile is just a placeholder for the commented out wrap above.
 		file = new CBPkgFile(file, _length);
 	}
 
diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp
index b41ae3c1bd..80d3b4a515 100644
--- a/engines/wintermute/base/file/base_package.cpp
+++ b/engines/wintermute/base/file/base_package.cpp
@@ -82,6 +82,24 @@ static bool findPackageSignature(Common::SeekableReadStream *f, uint32 *offset)
 
 }
 
+void TPackageHeader::readFromStream(Common::ReadStream *stream) {
+	_magic1 = stream->readUint32LE();
+	_magic2 = stream->readUint32LE();
+	_packageVersion = stream->readUint32LE();
+	
+	_gameVersion = stream->readUint32LE();
+	
+	_priority = stream->readByte();
+	_cd = stream->readByte();
+	_masterIndex = stream->readByte();
+	stream->readByte(); // To align the next byte...
+	
+	_creationTime = stream->readUint32LE();
+	
+	stream->read(_desc, 100);
+	_numDirs = stream->readUint32LE();
+}
+
 PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool searchSignature) {
 	uint32 absoluteOffset = 0;
 	_priority = 0;
diff --git a/engines/wintermute/base/file/dcpackage.h b/engines/wintermute/base/file/dcpackage.h
index 4a51683260..ccebc5909c 100644
--- a/engines/wintermute/base/file/dcpackage.h
+++ b/engines/wintermute/base/file/dcpackage.h
@@ -50,24 +50,8 @@ struct TPackageHeader {
 	uint32 _creationTime;
 	char _desc[100];
 	uint32 _numDirs;
-	// TODO: Move this out of the header.
-	void readFromStream(Common::ReadStream *stream) {
-		_magic1 = stream->readUint32LE();
-		_magic2 = stream->readUint32LE();
-		_packageVersion = stream->readUint32LE();
-
-		_gameVersion = stream->readUint32LE();
-
-		_priority = stream->readByte();
-		_cd = stream->readByte();
-		_masterIndex = stream->readByte();
-		stream->readByte(); // To align the next byte...
-
-		_creationTime = stream->readUint32LE();
-
-		stream->read(_desc, 100);
-		_numDirs = stream->readUint32LE();
-	}
+	// base_package.cpp:
+	void readFromStream(Common::ReadStream *stream);
 };
 
 /*
-- 
cgit v1.2.3