From 9b5cf8f1bafd5aa0dba9194a8f04e58724652891 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Sun, 29 Jul 2012 02:30:26 +0200
Subject: WINTERMUTE: Introduce a Singleton-class for holding
 registry/filemanager.

---
 engines/wintermute/base/file/base_file.cpp            | 2 +-
 engines/wintermute/base/file/base_file.h              | 4 ++--
 engines/wintermute/base/file/base_save_thumb_file.cpp | 6 +++---
 engines/wintermute/base/file/base_save_thumb_file.h   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/engines/wintermute/base/file/base_file.cpp b/engines/wintermute/base/file/base_file.cpp
index 11d095e70b..185a21ad57 100644
--- a/engines/wintermute/base/file/base_file.cpp
+++ b/engines/wintermute/base/file/base_file.cpp
@@ -37,7 +37,7 @@ namespace WinterMute {
 
 
 //////////////////////////////////////////////////////////////////////////
-BaseFile::BaseFile(BaseGame *inGame) : BaseClass(inGame) {
+BaseFile::BaseFile() {
 	_pos = 0;
 	_size = 0;
 }
diff --git a/engines/wintermute/base/file/base_file.h b/engines/wintermute/base/file/base_file.h
index 1a144414fc..0c1ab2a045 100644
--- a/engines/wintermute/base/file/base_file.h
+++ b/engines/wintermute/base/file/base_file.h
@@ -40,7 +40,7 @@ class SeekableReadStream;
 
 namespace WinterMute {
 
-class BaseFile : public BaseClass {
+class BaseFile {
 protected:
 	uint32 _pos;
 	uint32 _size;
@@ -56,7 +56,7 @@ public:
 	virtual bool close() = 0;
 	virtual bool open(const Common::String &filename) = 0;
 	virtual bool isEOF();
-	BaseFile(BaseGame *inGame);
+	BaseFile();
 	virtual ~BaseFile();
 	// Temporary solution to allow usage in ScummVM-code:
 	virtual Common::SeekableReadStream *getMemStream();
diff --git a/engines/wintermute/base/file/base_save_thumb_file.cpp b/engines/wintermute/base/file/base_save_thumb_file.cpp
index a285a93923..1f7288a6ff 100644
--- a/engines/wintermute/base/file/base_save_thumb_file.cpp
+++ b/engines/wintermute/base/file/base_save_thumb_file.cpp
@@ -26,7 +26,7 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
 #include "engines/wintermute/base/file/base_save_thumb_file.h"
 #include "engines/wintermute/platform_osystem.h"
 
@@ -38,7 +38,7 @@ namespace WinterMute {
 
 
 //////////////////////////////////////////////////////////////////////////
-BaseSaveThumbFile::BaseSaveThumbFile(BaseGame *inGame) : BaseFile(inGame) {
+BaseSaveThumbFile::BaseSaveThumbFile() {
 	_data = NULL;
 }
 
@@ -70,7 +70,7 @@ bool BaseSaveThumbFile::open(const Common::String &filename) {
 	int slot = atoi(tempFilename);
 	delete[] tempFilename;
 
-	BasePersistenceManager *pm = new BasePersistenceManager(_gameRef);
+	BasePersistenceManager *pm = new BasePersistenceManager();
 	Common::String slotFilename = pm->getFilenameForSlot(slot);
 	if (!pm) {
 		return STATUS_FAILED;
diff --git a/engines/wintermute/base/file/base_save_thumb_file.h b/engines/wintermute/base/file/base_save_thumb_file.h
index 6065f10f81..d95958d95f 100644
--- a/engines/wintermute/base/file/base_save_thumb_file.h
+++ b/engines/wintermute/base/file/base_save_thumb_file.h
@@ -37,7 +37,7 @@ namespace WinterMute {
 //TODO: Get rid of this
 class BaseSaveThumbFile : public BaseFile {
 public:
-	BaseSaveThumbFile(BaseGame *Game);
+	BaseSaveThumbFile();
 	virtual ~BaseSaveThumbFile();
 	virtual bool seek(uint32 pos, int whence = SEEK_SET);
 	virtual bool read(void *buffer, uint32 size);
-- 
cgit v1.2.3