TITANIC: Fleshed out CompressedFile class

1 files changed, 13 insertions, 52 deletions

diff --git a/engines/titanic/compressed_file.h b/engines/titanic/compressed_file.h
index cd9cf8377d..30b925d9b6 100644
--- a/engines/titanic/compressed_file.h
+++ b/engines/titanic/compressed_file.h
@@ -25,66 +25,27 @@
 
 #include "common/scummsys.h"
 #include "common/file.h"
-#include "common/queue.h"
+#include "titanic/compression.h"
 #include "titanic/simple_file.h"
 #include "titanic/string.h"
 
 namespace Titanic {
 
-class Decompressor;
-class DecompressorData;
-
-typedef DecompressorData *(Decompressor::*DecompressorCreateFn)(int v1, int v2, int v3);
-typedef void(Decompressor::*DecompressorDestroyFn)(DecompressorData *ptr);
-typedef void(Decompressor::*Method3Fn)();
-
-class DecompressorData {
-public:
-	int _field0;
-	int _field4;
-	int _field8;
-	int _fieldC;
-	int _field10;
-	int _field14;
-public:
-	DecompressorData();
-};
-
-class Decompressor {
-private:
-	DecompressorCreateFn _createFn;
-	DecompressorDestroyFn _destroyFn;
-	int _field18;
-	DecompressorData *_dataPtr;
-	int _field28;
-
-	DecompressorData *createMethod(int v1, int v2, int v3);
-
-	void destroyMethod(DecompressorData *ptr);
-
-	void method3() {
-		// TODO
-	}
-
-	int sub1(Method3Fn fn, int v);
-
-	void sub2() {}
-public:
-	Decompressor();
-
-	void load(const char *version = "1.0.4", int v = 15);
-
-	void close();
-};
+enum CompressedFileMode { COMPMODE_NONE, COMPMODE_WRITE, COMPMODE_READ };
 
+/**
+ * Derived file that handles compressed files
+ */
 class CompressedFile : public SimpleFile {
 private:
-	Decompressor _decompressor;
-	Common::Queue<byte> _queue;
-	int _fileMode;
-	int _isReading;
-	int _field260;
-	int _mode;
+	Compression _compression;
+	CompressedFileMode _fileMode;
+	byte _writeBuffer[516];
+	byte *_dataStartPtr;
+	byte *_dataPtr;
+	int _dataRemaining;
+	int _dataMaxSize;
+	int _dataCount;
 
 	/**
 	 * Decompress data from the source file