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)

svn-id: r15901

2 files changed, 7 insertions, 7 deletions

diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index a1173b66e7..4c495f28d5 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -69,7 +69,7 @@ bool ScummEngine::saveState(int slot, bool compat) {
 
 	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 @@ bool ScummEngine::loadState(int slot, bool compat) {
 	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 @@ void ScummEngine::listSavegames(bool *marks, int num) {
 	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 @@ bool ScummEngine::getSavegameName(int slot, char *desc) {
 	int len;
 
 	makeSavegameName(filename, slot, false);
-	if (!(out = _saveFileMan->open_savefile(filename, getSavePath(), false))) {
+	if (!(out = _saveFileMan->openSavefile(filename, false))) {
 		strcpy(desc, "");
 		return false;
 	}
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 4703b25d90..e1fdf8a298 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -1167,7 +1167,7 @@ void ScummEngine_v5::o5_saveLoadGame() {
 
 		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 @@ void ScummEngine_v5::o5_roomOps() {
 			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 @@ void ScummEngine_v5::o5_roomOps() {
 			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;