[Scummvm-cvs-logs] CVS: scummvm/common savefile.cpp,1.13,1.14

[Max Horn]

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

Modified Files:
	savefile.cpp 
Log Message:
Handle SCUMMVM_SAVEPATH exactly like the command line option --savepath (but the command line option has higher priority); i.e. it's affecting the config system (see also bug #1045171)

Index: savefile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/savefile.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- savefile.cpp	11 Dec 2004 00:39:27 -0000	1.13
+++ savefile.cpp	30 Dec 2004 21:48:21 -0000	1.14
@@ -39,21 +39,15 @@
 
 	const char *dir = NULL;
 
-#if !defined(MACOS_CARBON) && !defined(_WIN32_WCE)
-	dir = getenv("SCUMMVM_SAVEPATH");
-#endif
-
-	// If SCUMMVM_SAVEPATH was not specified, try to use game specific savepath from config
-	if (!dir || dir[0] == 0) {
+	// Try to use game specific savepath from config
+	dir = ConfMan.get("savepath").c_str();
+	
+	// Work around a bug (#999122) in the original 0.6.1 release of
+	// ScummVM, which would insert a bad savepath value into config files.
+	if (0 == strcmp(dir, "None")) {
+		ConfMan.removeKey("savepath", ConfMan.getActiveDomain());
+		ConfMan.flushToDisk();
 		dir = ConfMan.get("savepath").c_str();
-		
-		// Work around a bug (#999122) in the original 0.6.1 release of
-		// ScummVM, which would insert a bad savepath value into config files.
-		if (0 == strcmp(dir, "None")) {
-			ConfMan.removeKey("savepath", ConfMan.getActiveDomain());
-			ConfMan.flushToDisk();
-			dir = ConfMan.get("savepath").c_str();
-		}
 	}
 
 #ifdef _WIN32_WCE