[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.93,1.94

Max Horn fingolfin at users.sourceforge.net
Sun Apr 10 08:14:53 CEST 2005


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

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

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- control.cpp	9 Apr 2005 01:52:43 -0000	1.93
+++ control.cpp	10 Apr 2005 15:13:39 -0000	1.94
@@ -784,14 +784,14 @@
 bool Control::autoSaveExists(void) {
 
 	bool test = false;
-	SaveFile *f;
+	InSaveFile *f;
 	char fName[20];
 	if (SkyEngine::isCDVersion())
 		strcpy(fName, "SKY-VM-CD.ASD");
 	else
 		sprintf(fName, "SKY-VM%03d.ASD", SkyEngine::_systemVars.gameVersion);
 
-	f = _saveFileMan->openSavefile(fName, false);
+	f = _saveFileMan->openForLoading(fName);
 	if (f != NULL) {
 		test = true;
 		delete f;
@@ -1012,8 +1012,8 @@
 
 	memset(destBuf, 0, MAX_SAVE_GAMES * MAX_TEXT_LEN);
 
-	SaveFile *inf;
-	inf = _saveFileMan->openSavefile("SKY-VM.SAV", false);
+	InSaveFile *inf;
+	inf = _saveFileMan->openForLoading("SKY-VM.SAV");
 	if (inf != NULL) {
 		uint8 *tmpBuf = (uint8 *)malloc(MAX_SAVE_GAMES * MAX_TEXT_LEN);
 		inf->read(tmpBuf, MAX_SAVE_GAMES * MAX_TEXT_LEN);
@@ -1084,9 +1084,9 @@
 		tmpPos++;
 		srcPos += MAX_TEXT_LEN;
 	}
-	SaveFile *outf;
+	OutSaveFile *outf;
 
-	outf = _saveFileMan->openSavefile("SKY-VM.SAV", true);
+	outf = _saveFileMan->openForSaving("SKY-VM.SAV");
 	if (outf != NULL) {
 		outf->write(tmpBuf, tmpPos - tmpBuf);
 		delete outf;
@@ -1100,9 +1100,9 @@
 		strcpy(fName, "SKY-VM-CD.ASD");
 	else
 		sprintf(fName, "SKY-VM%03d.ASD", SkyEngine::_systemVars.gameVersion);
-	SaveFile *outf;
+	OutSaveFile *outf;
 
-	outf = _saveFileMan->openSavefile(fName, true);
+	outf = _saveFileMan->openForSaving(fName);
 	if (outf == NULL) {
 		displayMessage(0, "Unable to create autosave file '%s' in directory '%s'", fName, _saveFileMan->getSavePath());
 		return;
@@ -1121,8 +1121,8 @@
 	char fName[20];
 	sprintf(fName,"SKY-VM.%03d", _selectedGame);
 
-	SaveFile *outf;
-	outf = _saveFileMan->openSavefile(fName, true);
+	OutSaveFile *outf;
+	outf = _saveFileMan->openForSaving(fName);
 	if (outf == NULL) {
 		return NO_DISK_SPACE;
 	}
@@ -1396,8 +1396,8 @@
 	} else
 		sprintf(fName,"SKY-VM.%03d", _selectedGame);
 
-	SaveFile *inf;
-	inf = _saveFileMan->openSavefile(fName, false);
+	InSaveFile *inf;
+	inf = _saveFileMan->openForLoading(fName);
 	if (inf == NULL) {
 		return RESTORE_FAILED;
 	}





More information about the Scummvm-git-logs mailing list