[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.218,1.219 saveload.h,1.58,1.59 script_v5.cpp,1.284,1.285 scumm.h,1.622,1.623 thumbnail.cpp,1.1,1.2

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22345/scumm

Modified Files:
	saveload.cpp saveload.h script_v5.cpp scumm.h thumbnail.cpp 
Log Message:
Moved (In/Out)SaveFile(Manager) and Timer to namespace Common

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -d -r1.218 -r1.219
--- saveload.cpp	9 May 2005 00:09:00 -0000	1.218
+++ saveload.cpp	10 May 2005 23:17:16 -0000	1.219
@@ -68,7 +68,7 @@
 
 bool ScummEngine::saveState(int slot, bool compat) {
 	char filename[256];
-	OutSaveFile *out;
+	Common::OutSaveFile *out;
 	SaveGameHeader hdr;
 
 	makeSavegameName(filename, slot, compat);
@@ -94,7 +94,7 @@
 
 bool ScummEngine::loadState(int slot, bool compat) {
 	char filename[256];
-	InSaveFile *in;
+	Common::InSaveFile *in;
 	int i, j;
 	SaveGameHeader hdr;
 	int sb, sh;
@@ -365,7 +365,7 @@
 
 bool ScummEngine::getSavegameName(int slot, char *desc) {
 	char filename[256];
-	InSaveFile *in;
+	Common::InSaveFile *in;
 	SaveGameHeader hdr;
 	int len;
 
@@ -402,7 +402,7 @@
 
 Graphics::Surface *ScummEngine::loadThumbnailFromSlot(int slot) {
 	char filename[256];
-	InSaveFile *in;
+	Common::InSaveFile *in;
 	SaveGameHeader hdr;
 	int len;
 	

Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- saveload.h	9 May 2005 00:09:01 -0000	1.58
+++ saveload.h	10 May 2005 23:17:32 -0000	1.59
@@ -24,8 +24,10 @@
 
 #include "common/scummsys.h"
 
-class InSaveFile;
-class OutSaveFile;
+namespace Common {
+	class InSaveFile;
+	class OutSaveFile;
+}
 
 namespace Scumm {
 
@@ -126,7 +128,7 @@
 
 class Serializer {
 public:
-	Serializer(InSaveFile *in, OutSaveFile *out, uint32 savegameVersion)
+	Serializer(Common::InSaveFile *in, Common::OutSaveFile *out, uint32 savegameVersion)
 		: _loadStream(in), _saveStream(out), _save_ref(0), _load_ref(0), _ref_me(0),
 		  _savegameVersion(savegameVersion)
 	{ }
@@ -155,8 +157,8 @@
 	void loadBytes(void *b, int len);
 	
 protected:
-	InSaveFile *_loadStream;
-	OutSaveFile *_saveStream;
+	Common::InSaveFile *_loadStream;
+	Common::OutSaveFile *_saveStream;
 	uint32 _savegameVersion;
 
 	void saveArrayOf(void *b, int len, int datasize, byte filetype);

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- script_v5.cpp	20 Apr 2005 18:21:03 -0000	1.284
+++ script_v5.cpp	10 May 2005 23:17:33 -0000	1.285
@@ -1948,7 +1948,7 @@
 
 	case 13:	// SO_SAVE_STRING
 		{
-			OutSaveFile *file;
+			Common::OutSaveFile *file;
 			char filename[256], *s;
 
 			a = getVarOrDirectByte(PARAM_1);
@@ -1967,7 +1967,7 @@
 		}
 	case 14:	// SO_LOAD_STRING
 		{
-			InSaveFile *file;
+			Common::InSaveFile *file;
 			char filename[256], *s;
 
 			a = getVarOrDirectByte(PARAM_1);

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.622
retrieving revision 1.623
diff -u -d -r1.622 -r1.623
--- scumm.h	10 May 2005 22:31:48 -0000	1.622
+++ scumm.h	10 May 2005 23:17:34 -0000	1.623
@@ -37,8 +37,10 @@
 }
 using GUI::Dialog;
 class GameDetector;
-class InSaveFile;
-class OutSaveFile;
+namespace Common {
+	class InSaveFile;
+	class OutSaveFile;
+}
 
 namespace Scumm {
 
@@ -593,8 +595,8 @@
 	Graphics::Surface *loadThumbnailFromSlot(int slot);
 
 protected:
-	Graphics::Surface *loadThumbnail(InSaveFile *file);
-	void saveThumbnail(OutSaveFile *file);
+	Graphics::Surface *loadThumbnail(Common::InSaveFile *file);
+	void saveThumbnail(Common::OutSaveFile *file);
 
 protected:
 	/* Script VM - should be in Script class */

Index: thumbnail.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/thumbnail.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- thumbnail.cpp	9 May 2005 00:09:01 -0000	1.1
+++ thumbnail.cpp	10 May 2005 23:17:34 -0000	1.2
@@ -54,7 +54,7 @@
 	b = ((color&0x1F) << 3);
 }
 
-Graphics::Surface *ScummEngine::loadThumbnail(InSaveFile *file) {
+Graphics::Surface *ScummEngine::loadThumbnail(Common::InSaveFile *file) {
 	ThumbnailHeader header;
 	header.type = file->readUint32BE();
 	if (header.type != MKID('THMB'))
@@ -97,7 +97,7 @@
 	return thumb;
 }
 
-void ScummEngine::saveThumbnail(OutSaveFile *file) {
+void ScummEngine::saveThumbnail(Common::OutSaveFile *file) {
 	Graphics::Surface thumb;
  
 	if (!createThumbnailFromScreen(&thumb))