[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.181,1.182 script_v5.cpp,1.267,1.268

Max Horn fingolfin at users.sourceforge.net
Fri Nov 26 17:15:53 CET 2004


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

Modified Files:
	saveload.cpp script_v5.cpp 
Log Message:
Moved Engine::getSavePath() to class SaveFileManager; removed the 'directory' parameter from SaveFileManager::openSavefile and listSavefiles (they always use getSavePath() now, which is what we did anyway)

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -d -r1.181 -r1.182
--- saveload.cpp	8 Oct 2004 23:06:19 -0000	1.181
+++ saveload.cpp	27 Nov 2004 00:25:58 -0000	1.182
@@ -69,7 +69,7 @@
 
 	makeSavegameName(filename, slot, compat);
 
-	if (!(out = _saveFileMan->open_savefile(filename, getSavePath(), true)))
+	if (!(out = _saveFileMan->openSavefile(filename, true)))
 		return false;
 
 	memcpy(hdr.name, _saveLoadName, sizeof(hdr.name));
@@ -96,7 +96,7 @@
 	byte *roomptr;
 
 	makeSavegameName(filename, slot, compat);
-	if (!(in = _saveFileMan->open_savefile(filename, getSavePath(), false)))
+	if (!(in = _saveFileMan->openSavefile(filename, false)))
 		return false;
 
 	in->read(&hdr, sizeof(hdr));
@@ -329,7 +329,7 @@
 	char prefix[256];
 	makeSavegameName(prefix, 99, false);
 	prefix[strlen(prefix)-2] = 0;
-	_saveFileMan->list_savefiles(prefix, getSavePath(), marks, num);
+	_saveFileMan->listSavefiles(prefix, marks, num);
 }
 
 bool ScummEngine::getSavegameName(int slot, char *desc) {
@@ -339,7 +339,7 @@
 	int len;
 
 	makeSavegameName(filename, slot, false);
-	if (!(out = _saveFileMan->open_savefile(filename, getSavePath(), false))) {
+	if (!(out = _saveFileMan->openSavefile(filename, false))) {
 		strcpy(desc, "");
 		return false;
 	}

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -d -r1.267 -r1.268
--- script_v5.cpp	19 Oct 2004 12:30:40 -0000	1.267
+++ script_v5.cpp	27 Nov 2004 00:25:59 -0000	1.268
@@ -1167,7 +1167,7 @@
 
 		listSavegames(avail_saves, ARRAYSIZE(avail_saves));
 		makeSavegameName(filename, slot, false);
-		if (avail_saves[slot] && (_saveFileMan->open_savefile(filename, getSavePath(), false)))
+		if (avail_saves[slot] && (_saveFileMan->openSavefile(filename, false)))
 			result = 6; // save file exists
 		else
 			result = 7; // save file does not exist
@@ -1943,7 +1943,7 @@
 			s = filename;
 			while ((*s++ = fetchScriptByte()));
 
-			file = _saveFileMan->open_savefile(filename, getSavePath(), true);
+			file = _saveFileMan->openSavefile(filename, true);
 			if (file != NULL) {
 				byte *ptr;
 				ptr = getResourceAddress(rtString, a);
@@ -1962,7 +1962,7 @@
 			s = filename;
 			while ((*s++ = fetchScriptByte()));
 
-			file = _saveFileMan->open_savefile(filename, getSavePath(), false);
+			file = _saveFileMan->openSavefile(filename, false);
 			if (file != NULL) {
 				byte *ptr;
 				int len = 256, cnt = 0;





More information about the Scummvm-git-logs mailing list