Ticket #7993: simonsave.3.diff

scummvm/saveload.cpp

@@ -28 +28 @@
 #include "config-file.h"
 #include "resource.h"
 #include "saveload.h"
+#include "util.h"
 
 struct SaveGameHeader {
         uint32 type;
@@ -166 +167 @@
 
 void Scumm::makeSavegameName(char *out, int slot, bool compatible)
 {
-
-        const char *dir = NULL;
-
-#ifdef _WIN32_WCE
-        dir = _gameDataPath;
-#else
-
-#if !defined(MACOS_CARBON)
-        dir = getenv("SCUMMVM_SAVEPATH");
-#endif
-
-        // If SCUMMVM_SAVEPATH was not specified, try to use game specific savepath from config
-        if (!dir || dir[0] == 0)
-                dir = scummcfg->get("savepath");
-
-        // If SCUMMVM_SAVEPATH was not specified, try to use general path from config
-        if (!dir || dir[0] == 0)
-                dir = scummcfg->get("savepath", "scummvm");
-
-        // If no save path was specified, use no directory prefix
-        if (dir == NULL)
-                dir = "";
-#endif
-
         // 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/simon/simon.cpp

@@ -20 +20 @@
  */
 
 #include "stdafx.h"
+#include "util.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", GetSavegameDir(), slot);
         return buf;
 }
 

scummvm/util.cpp

@@ -19 +19 @@
  */
 
 #include "stdafx.h"
+#include "scumm.h"
+#include "config-file.h"
 #include "util.h"
 
+char *GetSavegameDir()
+{
+        static char savegame_dir[256];
+        const char *dir;
+
+#ifdef _WIN32_WCE
+        // Maybe we should pass _gameDataPath as an argument to this function
+        // instead of using g_scumm ...
+        dir = g_scumm->_gameDataPath;
+#else
+
+#if !defined(MACOS_CARBON)
+        dir = getenv("SCUMMVM_SAVEPATH");
+#endif
+
+        // If SCUMMVM_SAVEPATH was not specified, try to use game specific savepath from config
+        if (!dir || dir[0] == 0)
+                dir = scummcfg->get("savepath");
+
+        // If SCUMMVM_SAVEPATH was not specified, try to use general path from config
+        if (!dir || dir[0] == 0)
+                dir = scummcfg->get("savepath", "scummvm");
+
+        // If no save path was specified, use no directory prefix
+        if (dir == NULL)
+                dir = "";
+#endif
+
+        strcpy(savegame_dir, dir);
+        return savegame_dir;
+}
+
 // 8-bit alpha blending routines
 int BlendCache[256][256];
 

scummvm/util.h

@@ -23 +23 @@
 
 #include "scummsys.h"
 
+char *GetSavegameDir();
+
 int RGBMatch(byte *palette, int r, int g, int b);
 int Blend(int src, int dst, byte *palette);
 void ClearBlendCache(byte *palette, int weight);