Ticket #7993: simonsave.2.diff

scummvm/saveload.cpp

@@ -164 +164 @@
         return true;
 }
 
-void Scumm::makeSavegameName(char *out, int slot, bool compatible)
+const char *Scumm::getSavegameDir()
 {
-
         const char *dir = NULL;
 
 #ifdef _WIN32_WCE
@@ -190 +189 @@
                 dir = "";
 #endif
 
+        return dir;
+}
+
+void Scumm::makeSavegameName(char *out, int slot, bool compatible)
+{
         // snprintf should be used here, but it's not portable enough
-        sprintf(out, "%s%s.%c%.2d", dir, _exe_name, compatible ? 'c' : 's', slot);
+        sprintf(out, "%s%s.%c%.2d", getSavegameDir(), _exe_name, compatible ? 'c' : 's', slot);
 }
 
 bool Scumm::getSavegameName(int slot, char *desc)

scummvm/scumm.h

@@ -485 +485 @@
         void saveOrLoad(Serializer *s);
 
         bool getSavegameName(int slot, char *desc);
+        const char *getSavegameDir();
         void makeSavegameName(char *out, int slot, bool compatible);
         void saveLoadResource(Serializer *ser, int type, int index);
 

scummvm/simon/simon.cpp

@@ -20 +20 @@
  */
 
 #include "stdafx.h"
+#include "scumm.h"
 #include "simon.h"
 #include <errno.h>
 
@@ -4436 +4437 @@
 char *SimonState::gen_savename(int slot)
 {
         static char buf[256];
-        const char *dir;
 
-        /* perhaps getenv should be added to OSystem */
-#ifndef _WIN32_WCE
-        dir = getenv("SCUMMVM_SAVEPATH");
-        if (dir == NULL)
-                dir = "";
-#else
-        dir = _game_path;
-#endif
-
-        sprintf(buf, "%sSAVE.%.3d", dir, slot);
+        // snprintf should be used here, but it's not portable enough
+        sprintf(buf, "%sSAVE.%.3d", g_scumm->getSavegameDir(), slot);
         return buf;
 }