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, 10 insertions, 12 deletions

diff --git a/backends/PalmOS/Src/palmsave.cpp b/backends/PalmOS/Src/palmsave.cpp
index 291b4d9204..3c3c6791a3 100644
--- a/backends/PalmOS/Src/palmsave.cpp
+++ b/backends/PalmOS/Src/palmsave.cpp
@@ -126,17 +126,17 @@ uint32 PalmSaveFile::write(const void *buf, uint32 size) {
 
 class PalmSaveFileManager : public SaveFileManager {
 public:
-	SaveFile *open_savefile(const char *filename, const char *directory, bool saveOrLoad);
-	void list_savefiles(const char *prefix, const char *directory, bool *marks, int num);
+	SaveFile *openSavefile(const char *filename, bool saveOrLoad);
+	void listSavefiles(const char *prefix, bool *marks, int num);
 
 protected:
 	SaveFile *makeSaveFile(const char *filename, bool saveOrLoad);
 };
 
-SaveFile *PalmSaveFileManager::open_savefile(const char *filename, const char *directory, bool saveOrLoad) {
+SaveFile *PalmSaveFileManager::openSavefile(const char *filename, bool saveOrLoad) {
 	char buf[256];
 
-	strncpy(buf, directory, sizeof(buf));
+	strncpy(buf, getSavePath(), sizeof(buf));
 	strncat(buf, filename, sizeof(buf));
 
 	SaveFile *sf = makeSaveFile(buf, saveOrLoad);
@@ -148,10 +148,10 @@ SaveFile *PalmSaveFileManager::open_savefile(const char *filename, const char *d
 	return sf;
 }
 
-void PalmSaveFileManager::list_savefiles(const char *prefix, const char *directory, bool *marks, int num) {
+void PalmSaveFileManager::listSavefiles(const char *prefix, bool *marks, int num) {
 	FileRef fileRef;
 	// try to open the dir
-	Err e = VFSFileOpen(gVars->volRefNum, directory, vfsModeRead, &fileRef);
+	Err e = VFSFileOpen(gVars->volRefNum, getSavePath(), vfsModeRead, &fileRef);
 	memset(marks, false, num*sizeof(bool));
 
 	if (e != errNone)
diff --git a/backends/dc/vmsave.cpp b/backends/dc/vmsave.cpp
index 0e9d87c18d..68416fe553 100644
--- a/backends/dc/vmsave.cpp
+++ b/backends/dc/vmsave.cpp
@@ -258,12 +258,11 @@ public:
 
 class VMSaveManager : public SaveFileManager {
 public:
-  virtual SaveFile *open_savefile(const char *filename, const char *directory, bool saveOrLoad);
-  virtual void list_savefiles(const char *prefix, const char *directory, bool *marks, int num);
+  virtual SaveFile *openSavefile(const char *filename, bool saveOrLoad);
+  virtual void listSavefiles(const char *prefix, bool *marks, int num);
 };
 
-SaveFile *VMSaveManager::open_savefile(const char *filename, const char *directory,
-				       bool saveOrLoad)
+SaveFile *VMSaveManager::openSavefile(const char *filename, bool saveOrLoad)
 {
   VMSave *s = new VMSave(filename, saveOrLoad);
   if(saveOrLoad)
@@ -332,8 +331,7 @@ uint32 VMSave::write(const void *buf, uint32 cnt)
 }
 
 
-void VMSaveManager::list_savefiles(const char *prefix, const char *directory,
-				   bool *marks, int num)
+void VMSaveManager::listSavefiles(const char *prefix, bool *marks, int num)
 {
   memset(marks, false, num*sizeof(bool));