[Scummvm-cvs-logs] CVS: scummvm/simon saveload.cpp,1.5,1.6

[Max Horn]

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

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

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/saveload.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- saveload.cpp	10 Jan 2005 22:06:13 -0000	1.5
+++ saveload.cpp	10 Apr 2005 15:13:38 -0000	1.6
@@ -48,7 +48,7 @@
 }
 
 int SimonEngine::count_savegames() {
-	SaveFile *f;
+	InSaveFile *f;
 	uint i = 1;
 	bool marks[256];
 
@@ -58,7 +58,7 @@
 
 	while (i < 256) {
 		if (marks[i] &&
-		    (f = _saveFileMan->openSavefile(gen_savename(i), false))) {
+		    (f = _saveFileMan->openForLoading(gen_savename(i)))) {
 			i++;
 			delete f;
 		} else
@@ -69,7 +69,7 @@
 
 int SimonEngine::display_savegame_list(int curpos, bool load, char *dst) {
 	int slot, last_slot;
-	SaveFile *in;
+	InSaveFile *in;
 
 	showMessageFormat("\xC");
 
@@ -78,7 +78,7 @@
 	slot = curpos;
 
 	while (curpos + 6 > slot) {
-		if(!(in = _saveFileMan->openSavefile(gen_savename(slot), false)))
+		if(!(in = _saveFileMan->openForLoading(gen_savename(slot))))
 			break;
 
 		in->read(dst, 18);
@@ -102,7 +102,7 @@
 		}
 	} else {
 		if (curpos + 6 == slot) {
-			if((in = _saveFileMan->openSavefile(gen_savename(slot), false))) {
+			if((in = _saveFileMan->openForLoading(gen_savename(slot)))) {
 				slot++;
 				delete in;
 			}
@@ -407,7 +407,7 @@
 }
 
 bool SimonEngine::save_game(uint slot, char *caption) {
-	SaveFile *f;
+	OutSaveFile *f;
 	uint item_index, num_item, i, j;
 	TimeEvent *te;
 
@@ -418,7 +418,7 @@
 #endif
 
 
-	f = _saveFileMan->openSavefile(gen_savename(slot), true);
+	f = _saveFileMan->openForSaving(gen_savename(slot));
 	if (f == NULL) {
 		_lock_word &= ~0x100;
 		return false;
@@ -509,7 +509,7 @@
 
 bool SimonEngine::load_game(uint slot) {
 	char ident[18];
-	SaveFile *f;
+	InSaveFile *f;
 	uint num, item_index, i, j;
 
 	_lock_word |= 0x100;
@@ -519,7 +519,7 @@
 #endif
 
 
-	f = _saveFileMan->openSavefile(gen_savename(slot), false);
+	f = _saveFileMan->openForLoading(gen_savename(slot));
 	if (f == NULL) {
 		_lock_word &= ~0x100;
 		return false;