[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.4,1.5

Max Horn fingolfin at users.sourceforge.net
Fri Oct 10 03:51:15 CEST 2003


Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv26821/base

Modified Files:
	engine.cpp 
Log Message:
rearranged code a bit

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- engine.cpp	8 Oct 2003 21:59:21 -0000	1.4
+++ engine.cpp	10 Oct 2003 10:42:54 -0000	1.5
@@ -47,14 +47,15 @@
 }
 
 const char *Engine::getSavePath() const {
-	const char *dir = NULL;
 
 #ifdef _WIN32_WCE
-	dir = _gameDataPath;
+	return _gameDataPath;
 #elif defined(__PALM_OS__)
-	dir = SCUMMVM_SAVEPATH;
+	return SCUMMVM_SAVEPATH;
 #else
 
+	const char *dir = NULL;
+
 #if !defined(MACOS_CARBON)
 	dir = getenv("SCUMMVM_SAVEPATH");
 #endif
@@ -66,9 +67,9 @@
 	// If no save path was specified, use no directory prefix
 	if (dir == NULL)
 		dir = "";
-#endif
 
 	return dir;
+#endif
 }
 
 void NORETURN CDECL error(const char *s, ...) {





More information about the Scummvm-git-logs mailing list