[Scummvm-cvs-logs] SF.net SVN: scummvm: [23361] scummvm/trunk/common

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sat Jul 1 00:06:55 CEST 2006


Revision: 23361
Author:   fingolfin
Date:     2006-06-30 15:06:45 -0700 (Fri, 30 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23361&view=rev

Log Message:
-----------
Moved savefile.cpp to backends, to work around link error

Modified Paths:
--------------
    scummvm/trunk/backends/module.mk
    scummvm/trunk/common/module.mk

Added Paths:
-----------
    scummvm/trunk/backends/saves/savefile.cpp

Removed Paths:
-------------
    scummvm/trunk/common/savefile.cpp
Modified: scummvm/trunk/backends/module.mk
===================================================================
--- scummvm/trunk/backends/module.mk	2006-06-30 21:58:40 UTC (rev 23360)
+++ scummvm/trunk/backends/module.mk	2006-06-30 22:06:45 UTC (rev 23361)
@@ -13,6 +13,7 @@
 	midi/quicktime.o \
 	midi/seq.o \
 	midi/windows.o \
+	saves/savefile.o \
 	saves/default/default-saves.o \
 	timer/default/default-timer.o
 

Copied: scummvm/trunk/backends/saves/savefile.cpp (from rev 23355, scummvm/trunk/common/savefile.cpp)
===================================================================
--- scummvm/trunk/backends/saves/savefile.cpp	                        (rev 0)
+++ scummvm/trunk/backends/saves/savefile.cpp	2006-06-30 22:06:45 UTC (rev 23361)
@@ -0,0 +1,63 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2002-2006 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/stdafx.h"
+#include "common/util.h"
+#include "common/config-manager.h"
+#include "common/savefile.h"
+
+#include <stdio.h>
+#include <string.h>
+
+namespace Common {
+
+const char *SaveFileManager::getSavePath() const {
+
+#if defined(PALMOS_MODE) || defined(__PSP__)
+	return SCUMMVM_SAVEPATH;
+#else
+
+	const char *dir = NULL;
+
+	// 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.getActiveDomainName());
+		ConfMan.flushToDisk();
+		dir = ConfMan.get("savepath").c_str();
+	}
+
+#ifdef _WIN32_WCE
+	if (dir[0] == 0)
+		dir = ConfMan.get("path").c_str();
+#endif
+
+	assert(dir);
+
+	return dir;
+#endif
+}
+
+} // End of namespace Common

Modified: scummvm/trunk/common/module.mk
===================================================================
--- scummvm/trunk/common/module.mk	2006-06-30 21:58:40 UTC (rev 23360)
+++ scummvm/trunk/common/module.mk	2006-06-30 22:06:45 UTC (rev 23361)
@@ -11,7 +11,6 @@
 	str.o \
 	stream.o \
 	util.o \
-	savefile.o \
 	system.o \
 	unzip.o
 

Deleted: scummvm/trunk/common/savefile.cpp
===================================================================
--- scummvm/trunk/common/savefile.cpp	2006-06-30 21:58:40 UTC (rev 23360)
+++ scummvm/trunk/common/savefile.cpp	2006-06-30 22:06:45 UTC (rev 23361)
@@ -1,63 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "common/stdafx.h"
-#include "common/util.h"
-#include "common/config-manager.h"
-#include "common/savefile.h"
-
-#include <stdio.h>
-#include <string.h>
-
-namespace Common {
-
-const char *SaveFileManager::getSavePath() const {
-
-#if defined(PALMOS_MODE) || defined(__PSP__)
-	return SCUMMVM_SAVEPATH;
-#else
-
-	const char *dir = NULL;
-
-	// 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.getActiveDomainName());
-		ConfMan.flushToDisk();
-		dir = ConfMan.get("savepath").c_str();
-	}
-
-#ifdef _WIN32_WCE
-	if (dir[0] == 0)
-		dir = ConfMan.get("path").c_str();
-#endif
-
-	assert(dir);
-
-	return dir;
-#endif
-}
-
-} // End of namespace Common


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list