[Scummvm-cvs-logs] CVS: scummvm/common config-manager.cpp,1.41.2.4,1.41.2.5 scummsys.h,1.70.2.2,1.70.2.3

Robert Göffringmann lavosspawn at users.sourceforge.net
Wed Jan 25 18:40:10 CET 2006


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

Modified Files:
      Tag: branch-0-8-0
	config-manager.cpp scummsys.h 
Log Message:
ps2 specific change, look for scummvm.ini on various devices

Index: config-manager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.cpp,v
retrieving revision 1.41.2.4
retrieving revision 1.41.2.5
diff -u -d -r1.41.2.4 -r1.41.2.5
--- config-manager.cpp	25 Jan 2006 23:56:10 -0000	1.41.2.4
+++ config-manager.cpp	26 Jan 2006 02:39:25 -0000	1.41.2.5
@@ -26,6 +26,10 @@
 #include "common/file.h"
 #include "common/util.h"
 
+#ifdef __PLAYSTATION2__
+#include "backends/ps2/systemps2.h"
+#endif
+
 DECLARE_SINGLETON(Common::ConfigManager);
 
 #if defined(UNIX)
@@ -104,7 +108,7 @@
 	#elif defined(PALMOS_MODE)
 		strcpy(configFile,"/PALM/Programs/ScummVM/" DEFAULT_CONFIG_FILE);
 	#elif defined(__PLAYSTATION2__)
-		strcpy(configFile, "mc0:ScummVM/" DEFAULT_CONFIG_FILE);
+		((OSystem_PS2*)g_system)->makeConfigPath(configFile);
 	#elif defined(__PSP__)
 		strcpy(configFile, "ms0:/" DEFAULT_CONFIG_FILE);
 	#elif defined (__SYMBIAN32__)

Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scummsys.h,v
retrieving revision 1.70.2.2
retrieving revision 1.70.2.3
diff -u -d -r1.70.2.2 -r1.70.2.3
--- scummsys.h	18 Jan 2006 18:07:26 -0000	1.70.2.2
+++ scummsys.h	26 Jan 2006 02:39:25 -0000	1.70.2.3
@@ -287,6 +287,12 @@
 	#define fprintf				ps2_fprintf
 	#define fsize(a)			ps2_fsize(a)
 
+	extern "C" time_t ps2_time(time_t *p);
+	extern "C" struct tm *ps2_localtime(const time_t *p);
+
+	#define time(a)	ps2_time(a)
+	#define localtime(a) ps2_localtime(a)
+
 	extern void ps2_disableHandleCaching(void);
 #elif defined (__PSP__)
 	#define	SCUMM_NEED_ALIGNMENT





More information about the Scummvm-git-logs mailing list