[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.15,1.16

Nicolas Bacca arisme at users.sourceforge.net
Sun May 30 05:31:04 CEST 2004


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

Modified Files:
	engine.cpp 
Log Message:
Remove old savePath handling on WinCE

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- engine.cpp	4 Mar 2004 21:14:11 -0000	1.15
+++ engine.cpp	30 May 2004 12:30:29 -0000	1.16
@@ -54,15 +54,13 @@
 
 const char *Engine::getSavePath() const {
 
-#ifdef _WIN32_WCE
-	return _gameDataPath.c_str();
-#elif defined(__PALM_OS__)
+#if defined(__PALM_OS__)
 	return SCUMMVM_SAVEPATH;
 #else
 
 	const char *dir = NULL;
 
-#if !defined(MACOS_CARBON)
+#if !defined(MACOS_CARBON) && !defined(_WIN32_WCE)
 	dir = getenv("SCUMMVM_SAVEPATH");
 #endif
 
@@ -70,6 +68,11 @@
 	if (!dir || dir[0] == 0)
 		dir = ConfMan.get("savepath").c_str();
 
+#ifdef _WIN32_WCE
+	if (dir[0] == 0)
+		dir = _gameDataPath.c_str();
+#endif
+
 	assert(dir);
 
 	return dir;





More information about the Scummvm-git-logs mailing list