[Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.125,1.126 queen.h,1.40,1.41

[Max Horn]

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

Modified Files:
	queen.cpp queen.h 
Log Message:
split SaveFileManager::openSavefile and class SaveFile into two, each, one for loading and one for saving

Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- queen.cpp	7 Apr 2005 08:57:39 -0000	1.125
+++ queen.cpp	10 Apr 2005 15:13:37 -0000	1.126
@@ -252,7 +252,7 @@
 	debug(3, "Saving game to slot %d", slot);
 	char name[20];
 	makeGameStateName(slot, name);
-	SaveFile *file = _saveFileMan->openSavefile(name, true);
+	OutSaveFile *file = _saveFileMan->openForSaving(name);
 	if (file) {
 		// save data
 		byte *saveData = new byte[30000];
@@ -287,7 +287,7 @@
 void QueenEngine::loadGameState(uint16 slot) {
 	debug(3, "Loading game from slot %d", slot);
 	GameStateHeader header;
-	SaveFile *file = readGameStateHeader(slot, &header);
+	InSaveFile *file = readGameStateHeader(slot, &header);
 	if (file && header.dataSize != 0) {
 		byte *saveData = new byte[header.dataSize];
 		byte *p = saveData;
@@ -308,10 +308,10 @@
 	}
 }
 
-SaveFile *QueenEngine::readGameStateHeader(uint16 slot, GameStateHeader *gsh) {
+InSaveFile *QueenEngine::readGameStateHeader(uint16 slot, GameStateHeader *gsh) {
 	char name[20];
 	makeGameStateName(slot, name);
-	SaveFile *file = _saveFileMan->openSavefile(name, false);
+	InSaveFile *file = _saveFileMan->openForLoading(name);
 	if (file && file->readUint32BE() == 'SCVM') {
 		gsh->version = file->readUint32BE();
 		gsh->flags = file->readUint32BE();
@@ -340,7 +340,7 @@
 	for (int i = 0; i < SAVESTATE_MAX; ++i) {
 		if (marks[i]) {
 			GameStateHeader header;
-			SaveFile *f = readGameStateHeader(i, &header);
+			InSaveFile *f = readGameStateHeader(i, &header);
 			strcpy(descriptions[i], header.description);
 			delete f;
 		}

Index: queen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- queen.h	1 Jan 2005 16:09:09 -0000	1.40
+++ queen.h	10 Apr 2005 15:13:37 -0000	1.41
@@ -25,7 +25,7 @@
 #include "base/engine.h"
 
 class GameDetector;
-class SaveFile;
+class InSaveFile;
 
 #if defined(_WIN32_WCE) && (_WIN32_WCE <= 300)
 
@@ -114,7 +114,7 @@
 	void loadGameState(uint16 slot);
 	void makeGameStateName(uint16 slot, char *buf);
 	void findGameStateDescriptions(char descriptions[100][32]);
-	SaveFile *readGameStateHeader(uint16 slot, GameStateHeader *gsh);
+	InSaveFile *readGameStateHeader(uint16 slot, GameStateHeader *gsh);
 
 	enum {
 		SAVESTATE_CUR_VER = 1,