WINTERMUTE: Remove Base as superclass for base_file_entry

8 files changed, 8 insertions, 16 deletions

diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index 2fd5521e37..70818bcb61 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -492,7 +492,7 @@ bool BaseFileManager::registerPackage(Common::SeekableReadStream *package, const
 			}

 			_filesIter = _files.find(name);

 			if (_filesIter == _files.end()) {

-				BaseFileEntry *file = new BaseFileEntry(_gameRef);

+				BaseFileEntry *file = new BaseFileEntry();

 				file->_package = pkg;

 				file->_offset = offset;

 				file->_length = length;

diff --git a/engines/wintermute/base/base_file_manager.h b/engines/wintermute/base/base_file_manager.h
index 78e6cb737f..7799f5193a 100644
--- a/engines/wintermute/base/base_file_manager.h
+++ b/engines/wintermute/base/base_file_manager.h
@@ -30,6 +30,7 @@
 #define WINTERMUTE_BFILEMANAGER_H

 

 #include "engines/wintermute/base/file/base_file_entry.h"

+#include "engines/wintermute/base/base.h"

 #include "common/archive.h"

 #include "common/str.h"

 #include "common/fs.h"

diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index c20fd9f342..21f7c7c189 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -27,8 +27,6 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/base/base_game.h"

-#include "engines/wintermute/wintypes.h"

 #include "engines/wintermute/base/file/BPkgFile.h"

 #include "engines/wintermute/base/file/base_disk_file.h"

 #include "engines/wintermute/base/base_file_manager.h"

@@ -49,7 +47,6 @@ void correctSlashes(char *fileName) {
 }

 

 bool diskFileExists(const Common::String& filename) {

-	Common::SeekableReadStream *file = NULL;

 	// Try directly from SearchMan first

 	Common::ArchiveMemberList files;

 	SearchMan.listMatchingMembers(files, filename);

@@ -86,7 +83,6 @@ bool diskFileExists(const Common::String& filename) {
 }

 

 Common::SeekableReadStream *openDiskFile(const Common::String &filename, BaseFileManager *fileManager) {

-	char fullPath[MAX_PATH_LENGTH];

 	uint32 prefixSize = 0;

 	Common::SeekableReadStream *file = NULL;

 	// Try directly from SearchMan first

diff --git a/engines/wintermute/base/file/base_disk_file.h b/engines/wintermute/base/file/base_disk_file.h
index b0ba32cb84..13d5c3e03c 100644
--- a/engines/wintermute/base/file/base_disk_file.h
+++ b/engines/wintermute/base/file/base_disk_file.h
@@ -29,9 +29,7 @@
 #ifndef WINTERMUTE_BDISKFILE_H

 #define WINTERMUTE_BDISKFILE_H

 

-namespace Common {

-class SeekableReadStream;

-}

+#include "common/stream.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/base/file/base_file_entry.cpp b/engines/wintermute/base/file/base_file_entry.cpp
index d3e0fee7b0..43527f9fc0 100644
--- a/engines/wintermute/base/file/base_file_entry.cpp
+++ b/engines/wintermute/base/file/base_file_entry.cpp
@@ -25,13 +25,13 @@
  * http://dead-code.org/redir.php?target=wmelite

  * Copyright (c) 2011 Jan Nedoma

  */

-#include "engines/wintermute/dcgf.h"

+

 #include "engines/wintermute/base/file/base_file_entry.h"

 

 namespace WinterMute {

 

 //////////////////////////////////////////////////////////////////////////

-BaseFileEntry::BaseFileEntry(BaseGame *inGame): BaseClass(inGame) {

+BaseFileEntry::BaseFileEntry(){

 	_package = NULL;

 	_length = _compressedLength = _offset = _flags = 0;

 	_filename = "";

diff --git a/engines/wintermute/base/file/base_file_entry.h b/engines/wintermute/base/file/base_file_entry.h
index 0e0375e42d..086a70e7ed 100644
--- a/engines/wintermute/base/file/base_file_entry.h
+++ b/engines/wintermute/base/file/base_file_entry.h
@@ -29,14 +29,13 @@
 #ifndef WINTERMUTE_BFILEENTRY_H

 #define WINTERMUTE_BFILEENTRY_H

 

-

-#include "engines/wintermute/base/base.h"

+#include "common/str.h"

 

 namespace WinterMute {

 

 class BasePackage;

 

-class BaseFileEntry : public BaseClass {

+class BaseFileEntry {

 public:

 	uint32 _timeDate2;

 	uint32 _timeDate1;

@@ -47,7 +46,7 @@ public:
 	uint32 _length;

 	uint32 _offset;

 	BasePackage *_package;

-	BaseFileEntry(BaseGame *inGame);

+	BaseFileEntry();

 	virtual ~BaseFileEntry();

 

 };

diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp
index a95be25a81..303d6eea17 100644
--- a/engines/wintermute/base/file/base_package.cpp
+++ b/engines/wintermute/base/file/base_package.cpp
@@ -28,7 +28,6 @@
 

 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/base/file/base_package.h"

-#include "engines/wintermute/base/base_game.h"

 #include "engines/wintermute/base/base_file_manager.h"

 #include "common/file.h"

 #include "common/stream.h"

diff --git a/engines/wintermute/base/file/base_resources.cpp b/engines/wintermute/base/file/base_resources.cpp
index f7aaf6393a..73c06271d7 100644
--- a/engines/wintermute/base/file/base_resources.cpp
+++ b/engines/wintermute/base/file/base_resources.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/file/base_resources.h"

 #include "common/str.h"

 #include "common/memstream.h"