From 4a10bc8b141f575ceb9c4d87563290d2791e3380 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Sat, 2 Jun 2012 11:09:22 +0200
Subject: WINTERMUTE: Revamp the file-system to deliver Common::-streams
 directly

---
 engines/wintermute/Base/file/BPkgFile.h | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

(limited to 'engines/wintermute/Base/file/BPkgFile.h')

diff --git a/engines/wintermute/Base/file/BPkgFile.h b/engines/wintermute/Base/file/BPkgFile.h
index 912b351ac8..e2d90e2b50 100644
--- a/engines/wintermute/Base/file/BPkgFile.h
+++ b/engines/wintermute/Base/file/BPkgFile.h
@@ -29,12 +29,7 @@
 #ifndef WINTERMUTE_BPKGFILE_H
 #define WINTERMUTE_BPKGFILE_H
 
-
-#include "engines/wintermute/Base/file/BFile.h"
 #include "engines/wintermute/Base/BFileEntry.h"
-#include <zlib.h>   // Added by ClassView
-
-#define COMPRESSED_BUFFER_SIZE 4096
 
 namespace Common {
 class SeekableReadStream;
@@ -43,21 +38,8 @@ class File;
 
 namespace WinterMute {
 
-class CBPkgFile : public CBFile {
-public:
-	CBPkgFile(CBGame *inGame);
-	virtual ~CBPkgFile();
-	virtual HRESULT Seek(uint32 pos, TSeek origin = SEEK_TO_BEGIN);
-	virtual HRESULT Read(void *buffer, uint32 size);
-	virtual HRESULT Close();
-	virtual HRESULT Open(const Common::String &filename);
-private:
-	bool _inflateInit;
-	HRESULT SeekToPos(uint32 newPos);
-	bool _compressed;
-	CBFileEntry *_fileEntry;
-	Common::SeekableReadStream *_file;
-};
+class CBFileManager;
+Common::SeekableReadStream *openPkgFile(const Common::String &Filename, CBFileManager *fileManager);
 
 } // end of namespace WinterMute
 
-- 
cgit v1.2.3