[Scummvm-cvs-logs] CVS: scummvm main.cpp,1.29,1.30

Max Horn fingolfin at users.sourceforge.net
Sun Aug 18 14:43:03 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv12094

Modified Files:
	main.cpp 
Log Message:
cleanup

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/main.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- main.cpp	18 Aug 2002 18:39:41 -0000	1.29
+++ main.cpp	18 Aug 2002 21:42:41 -0000	1.30
@@ -104,14 +104,13 @@
 #endif
 
 #if defined(UNIX)
+	/* On Unix, do a quick endian / alignement check before starting */
+	do_memory_test();
+
 	char scummhome[MAXPATHLEN];
 	if(getenv("HOME") != NULL)
 		sprintf(scummhome,"%s/%s", getenv("HOME"), DEFAULT_CONFIG_FILE);
 	else strcpy(scummhome,DEFAULT_CONFIG_FILE);
-	scummcfg = new Config(scummhome, "scummvm");
-
-	/* On Unix, do a quick endian / alignement check before starting */
-	do_memory_test();
 #else
     char scummhome[255];
 	#if defined (WIN32) && !defined(_WIN32_WCE)
@@ -121,8 +120,9 @@
 	#else	
 		strcpy(scummhome,DEFAULT_CONFIG_FILE);
 	#endif
-	scummcfg = new Config(scummhome, "scummvm");
 #endif
+
+	scummcfg = new Config(scummhome, "scummvm");
 	scummcfg->set("versioninfo", SCUMMVM_VERSION);
 	if (detector.detectMain(argc, argv))
 		return (-1);





More information about the Scummvm-git-logs mailing list