Moved savefile code to new 'saves' backend module (work in progress)

svn-id: r23282

6 files changed, 250 insertions, 195 deletions

diff --git a/backends/module.mk b/backends/module.mk
index 5522f131a7..b5ca8a2191 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -13,6 +13,7 @@ MODULE_OBJS := \
 	midi/quicktime.o \
 	midi/seq.o \
 	midi/windows.o \
+	saves/default/default-saves.o \
 	timer/default/default-timer.o
 
 # Include common rules 
diff --git a/backends/saves/default/default-saves.cpp b/backends/saves/default/default-saves.cpp
new file mode 100644
index 0000000000..d48ccc2be8
--- /dev/null
+++ b/backends/saves/default/default-saves.cpp
@@ -0,0 +1,207 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2002-2006 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/stdafx.h"
+//#include "common/util.h"
+#include "backends/saves/default/default-saves.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#ifdef USE_ZLIB
+#include <zlib.h>
+#endif
+
+class StdioSaveFile : public Common::InSaveFile, public Common::OutSaveFile {
+private:
+	FILE *fh;
+public:
+	StdioSaveFile(const char *filename, bool saveOrLoad) {
+		fh = ::fopen(filename, (saveOrLoad? "wb" : "rb"));
+	}
+	~StdioSaveFile() {
+		if (fh)
+			::fclose(fh);
+	}
+
+	bool eos() const { return feof(fh) != 0; }
+	bool ioFailed() const { return ferror(fh) != 0; }
+	void clearIOFailed() { clearerr(fh); }
+
+	bool isOpen() const { return fh != 0; }
+
+	uint32 read(void *dataPtr, uint32 dataSize) {
+		assert(fh);
+		return fread(dataPtr, 1, dataSize, fh);
+	}
+	uint32 write(const void *dataPtr, uint32 dataSize) {
+		assert(fh);
+		return fwrite(dataPtr, 1, dataSize, fh);
+	}
+
+	uint32 pos() const {
+		assert(fh);
+		return ftell(fh);
+	}
+	uint32 size() const {
+		assert(fh);
+		uint32 oldPos = ftell(fh);
+		fseek(fh, 0, SEEK_END);
+		uint32 length = ftell(fh);
+		fseek(fh, oldPos, SEEK_SET);
+		return length;
+	}
+
+	void seek(int32 offs, int whence = SEEK_SET) {
+		assert(fh);
+		fseek(fh, offs, whence);
+	}
+};
+
+
+#ifdef USE_ZLIB
+class GzipSaveFile : public Common::InSaveFile, public Common::OutSaveFile {
+private:
+	gzFile fh;
+	bool _ioError;
+public:
+	GzipSaveFile(const char *filename, bool saveOrLoad) {
+		_ioError = false;
+		fh = gzopen(filename, (saveOrLoad? "wb" : "rb"));
+	}
+	~GzipSaveFile() {
+		if (fh)
+			gzclose(fh);
+	}
+
+	bool eos() const { return gzeof(fh) != 0; }
+	bool ioFailed() const { return _ioError; }
+	void clearIOFailed() { _ioError = false; }
+
+	bool isOpen() const { return fh != 0; }
+
+	uint32 read(void *dataPtr, uint32 dataSize) {
+		assert(fh);
+		int ret = gzread(fh, dataPtr, dataSize);
+		if (ret <= -1)
+			_ioError = true;
+		return ret;
+	}
+	uint32 write(const void *dataPtr, uint32 dataSize) {
+		assert(fh);
+		// Due to a "bug" in the zlib headers (or maybe I should say,
+		// a bug in the C++ spec? Whatever <g>) we have to be a bit
+		// hackish here and remove the const qualifier.
+		// Note that gzwrite's buf param is declared as "const voidp"
+		// which you might think is the same as "const void *" but it
+		// is not - rather it is equal to "void const *" which is the
+		// same as "void *". Hrmpf
+		int ret = gzwrite(fh, const_cast<void *>(dataPtr), dataSize);
+		if (ret <= 0)
+			_ioError = true;
+		return ret;
+	}
+
+	uint32 pos() const {
+		assert(fh);
+		return gztell(fh);
+	}
+	uint32 size() const {
+		assert(fh);
+		uint32 oldPos = gztell(fh);
+		gzseek(fh, 0, SEEK_END);
+		uint32 length = gztell(fh);
+		gzseek(fh, oldPos, SEEK_SET);
+		return length;
+	}
+
+	void seek(int32 offs, int whence = SEEK_SET) {
+		assert(fh);
+		gzseek(fh, offs, whence);
+	}
+};
+#endif
+
+
+static void join_paths(const char *filename, const char *directory,
+								 char *buf, int bufsize) {
+	buf[bufsize-1] = '\0';
+	strncpy(buf, directory, bufsize-1);
+
+#ifdef WIN32
+	// Fix for Win98 issue related with game directory pointing to root drive ex. "c:\"
+	if ((buf[0] != 0) && (buf[1] == ':') && (buf[2] == '\\') && (buf[3] == 0)) {
+		buf[2] = 0;
+	}
+#endif
+
+	const int dirLen = strlen(buf);
+
+	if (dirLen > 0) {
+#if defined(__MORPHOS__) || defined(__amigaos4__)
+		if (buf[dirLen-1] != ':' && buf[dirLen-1] != '/')
+#endif
+
+#if !defined(__GP32__) && !defined(PALMOS_MODE)
+		strncat(buf, "/", bufsize-1);	// prevent double /
+#endif
+	}
+	strncat(buf, filename, bufsize-1);
+}
+
+Common::OutSaveFile *DefaultSaveFileManager::openForSaving(const char *filename) {
+	char buf[256];
+	join_paths(filename, getSavePath(), buf, sizeof(buf));
+
+#ifdef USE_ZLIB
+	GzipSaveFile *sf = new GzipSaveFile(buf, true);
+#else
+	StdioSaveFile *sf = new StdioSaveFile(buf, true);
+#endif
+
+	if (!sf->isOpen()) {
+		delete sf;
+		sf = 0;
+	}
+	return sf;
+}
+
+Common::InSaveFile *DefaultSaveFileManager::openForLoading(const char *filename) {
+	char buf[256];
+	join_paths(filename, getSavePath(), buf, sizeof(buf));
+
+#ifdef USE_ZLIB
+	GzipSaveFile *sf = new GzipSaveFile(buf, false);
+#else
+	StdioSaveFile *sf = new StdioSaveFile(buf, false);
+#endif
+
+	if (!sf->isOpen()) {
+		delete sf;
+		sf = 0;
+	}
+	return sf;
+}
+
+void DefaultSaveFileManager::listSavefiles(const char * /* prefix */, bool *marks, int num) {
+	memset(marks, true, num * sizeof(bool));
+}
diff --git a/backends/saves/default/default-saves.h b/backends/saves/default/default-saves.h
new file mode 100644
index 0000000000..8a6df66af9
--- /dev/null
+++ b/backends/saves/default/default-saves.h
@@ -0,0 +1,36 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2002-2006 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef BACKEND_SAVES_DEFAULT_H
+#define BACKEND_SAVES_DEFAULT_H
+
+#include "common/stdafx.h"
+#include "common/savefile.h"
+
+class DefaultSaveFileManager : public Common::SaveFileManager {
+public:
+	virtual Common::OutSaveFile *openForSaving(const char *filename);
+	virtual Common::InSaveFile *openForLoading(const char *filename);
+	virtual void listSavefiles(const char * /* prefix */, bool *marks, int num);
+};
+
+#endif
diff --git a/common/savefile.cpp b/common/savefile.cpp
index afc79df379..567dcba516 100644
--- a/common/savefile.cpp
+++ b/common/savefile.cpp
@@ -28,10 +28,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef USE_ZLIB
-#include <zlib.h>
-#endif
-
 namespace Common {
 
 const char *SaveFileManager::getSavePath() const {
@@ -64,179 +60,4 @@ const char *SaveFileManager::getSavePath() const {
 #endif
 }
 
-class StdioSaveFile : public InSaveFile, public OutSaveFile {
-private:
-	FILE *fh;
-public:
-	StdioSaveFile(const char *filename, bool saveOrLoad) {
-		fh = ::fopen(filename, (saveOrLoad? "wb" : "rb"));
-	}
-	~StdioSaveFile() {
-		if (fh)
-			::fclose(fh);
-	}
-
-	bool eos() const { return feof(fh) != 0; }
-	bool ioFailed() const { return ferror(fh) != 0; }
-	void clearIOFailed() { clearerr(fh); }
-
-	bool isOpen() const { return fh != 0; }
-
-	uint32 read(void *dataPtr, uint32 dataSize) {
-		assert(fh);
-		return fread(dataPtr, 1, dataSize, fh);
-	}
-	uint32 write(const void *dataPtr, uint32 dataSize) {
-		assert(fh);
-		return fwrite(dataPtr, 1, dataSize, fh);
-	}
-
-	uint32 pos() const {
-		assert(fh);
-		return ftell(fh);
-	}
-	uint32 size() const {
-		assert(fh);
-		uint32 oldPos = ftell(fh);
-		fseek(fh, 0, SEEK_END);
-		uint32 length = ftell(fh);
-		fseek(fh, oldPos, SEEK_SET);
-		return length;
-	}
-
-	void seek(int32 offs, int whence = SEEK_SET) {
-		assert(fh);
-		fseek(fh, offs, whence);
-	}
-};
-
-
-#ifdef USE_ZLIB
-class GzipSaveFile : public InSaveFile, public OutSaveFile {
-private:
-	gzFile fh;
-	bool _ioError;
-public:
-	GzipSaveFile(const char *filename, bool saveOrLoad) {
-		_ioError = false;
-		fh = gzopen(filename, (saveOrLoad? "wb" : "rb"));
-	}
-	~GzipSaveFile() {
-		if (fh)
-			gzclose(fh);
-	}
-
-	bool eos() const { return gzeof(fh) != 0; }
-	bool ioFailed() const { return _ioError; }
-	void clearIOFailed() { _ioError = false; }
-
-	bool isOpen() const { return fh != 0; }
-
-	uint32 read(void *dataPtr, uint32 dataSize) {
-		assert(fh);
-		int ret = gzread(fh, dataPtr, dataSize);
-		if (ret <= -1)
-			_ioError = true;
-		return ret;
-	}
-	uint32 write(const void *dataPtr, uint32 dataSize) {
-		assert(fh);
-		// Due to a "bug" in the zlib headers (or maybe I should say,
-		// a bug in the C++ spec? Whatever <g>) we have to be a bit
-		// hackish here and remove the const qualifier.
-		// Note that gzwrite's buf param is declared as "const voidp"
-		// which you might think is the same as "const void *" but it
-		// is not - rather it is equal to "void const *" which is the
-		// same as "void *". Hrmpf
-		int ret = gzwrite(fh, const_cast<void *>(dataPtr), dataSize);
-		if (ret <= 0)
-			_ioError = true;
-		return ret;
-	}
-
-	uint32 pos() const {
-		assert(fh);
-		return gztell(fh);
-	}
-	uint32 size() const {
-		assert(fh);
-		uint32 oldPos = gztell(fh);
-		gzseek(fh, 0, SEEK_END);
-		uint32 length = gztell(fh);
-		gzseek(fh, oldPos, SEEK_SET);
-		return length;
-	}
-
-	void seek(int32 offs, int whence = SEEK_SET) {
-		assert(fh);
-		gzseek(fh, offs, whence);
-	}
-};
-#endif
-
-
-static void join_paths(const char *filename, const char *directory,
-								 char *buf, int bufsize) {
-	buf[bufsize-1] = '\0';
-	strncpy(buf, directory, bufsize-1);
-
-#ifdef WIN32
-	// Fix for Win98 issue related with game directory pointing to root drive ex. "c:\"
-	if ((buf[0] != 0) && (buf[1] == ':') && (buf[2] == '\\') && (buf[3] == 0)) {
-		buf[2] = 0;
-	}
-#endif
-
-	const int dirLen = strlen(buf);
-
-	if (dirLen > 0) {
-#if defined(__MORPHOS__) || defined(__amigaos4__)
-		if (buf[dirLen-1] != ':' && buf[dirLen-1] != '/')
-#endif
-
-#if !defined(__GP32__) && !defined(PALMOS_MODE)
-		strncat(buf, "/", bufsize-1);	// prevent double /
-#endif
-	}
-	strncat(buf, filename, bufsize-1);
-}
-
-OutSaveFile *DefaultSaveFileManager::openForSaving(const char *filename) {
-	char buf[256];
-	join_paths(filename, getSavePath(), buf, sizeof(buf));
-
-#ifdef USE_ZLIB
-	GzipSaveFile *sf = new GzipSaveFile(buf, true);
-#else
-	StdioSaveFile *sf = new StdioSaveFile(buf, true);
-#endif
-
-	if (!sf->isOpen()) {
-		delete sf;
-		sf = 0;
-	}
-	return sf;
-}
-
-InSaveFile *DefaultSaveFileManager::openForLoading(const char *filename) {
-	char buf[256];
-	join_paths(filename, getSavePath(), buf, sizeof(buf));
-
-#ifdef USE_ZLIB
-	GzipSaveFile *sf = new GzipSaveFile(buf, false);
-#else
-	StdioSaveFile *sf = new StdioSaveFile(buf, false);
-#endif
-
-	if (!sf->isOpen()) {
-		delete sf;
-		sf = 0;
-	}
-	return sf;
-}
-
-void DefaultSaveFileManager::listSavefiles(const char * /* prefix */, bool *marks, int num) {
-	memset(marks, true, num * sizeof(bool));
-}
-
 } // End of namespace Common
diff --git a/common/savefile.h b/common/savefile.h
index d85d03268c..cc78039b71 100644
--- a/common/savefile.h
+++ b/common/savefile.h
@@ -34,23 +34,19 @@ namespace Common {
  * That typically means "save games", but also includes things like the
  * IQ points in Indy3.
  */
-class InSaveFile : public SeekableReadStream {
-};
+class InSaveFile : public SeekableReadStream {};
 
 /**
  * A class which allows game engines to save game state data.
  * That typically means "save games", but also includes things like the
  * IQ points in Indy3.
  */
-class OutSaveFile : public WriteStream {
-};
+class OutSaveFile : public WriteStream {};
 
 /**
  * Convenience intermediate class, to be removed.
  */
-class SaveFile : public InSaveFile, public OutSaveFile {
-public:
-};
+class SaveFile : public InSaveFile, public OutSaveFile {};
 
 class SaveFileManager {
 
@@ -87,13 +83,6 @@ public:
 	virtual const char *getSavePath() const;
 };
 
-class DefaultSaveFileManager : public SaveFileManager {
-public:
-	virtual OutSaveFile *openForSaving(const char *filename);
-	virtual InSaveFile *openForLoading(const char *filename);
-	virtual void listSavefiles(const char * /* prefix */, bool *marks, int num);
-};
-
 } // End of namespace Common
 
 #endif
diff --git a/common/system.cpp b/common/system.cpp
index 4207b1f64f..22bbb9aba4 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -27,8 +27,9 @@
 
 #include "gui/message.h"
 
+#include "backends/saves/default/default-saves.h"
+
 #include "common/config-manager.h"
-#include "common/savefile.h"
 #include "common/system.h"
 #include "common/util.h"
 
@@ -62,7 +63,7 @@ void OSystem::displayMessageOnOSD(const char *msg) {
 }
 
 Common::SaveFileManager *OSystem::getSavefileManager() {
-	return new Common::DefaultSaveFileManager();
+	return new DefaultSaveFileManager();
 }