[Scummvm-cvs-logs] SF.net SVN: scummvm: [22345] scummvm/trunk/base

[fingolfin at users.sourceforge.net]

Revision: 22345
Author:   fingolfin
Date:     2006-05-04 15:55:15 -0700 (Thu, 04 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22345&view=rev

Log Message:
-----------
Make sure our config default values get properly registered

Modified Paths:
--------------
    scummvm/trunk/base/gameDetector.cpp
    scummvm/trunk/base/gameDetector.h
    scummvm/trunk/base/main.cpp
Modified: scummvm/trunk/base/gameDetector.cpp
===================================================================
--- scummvm/trunk/base/gameDetector.cpp	2006-05-04 22:52:18 UTC (rev 22344)
+++ scummvm/trunk/base/gameDetector.cpp	2006-05-04 22:55:15 UTC (rev 22345)
@@ -150,7 +150,7 @@
 	exit(1);
 }
 
-GameDetector::GameDetector() {
+void GameDetector::registerDefaults() {
 
 	// Graphics
 	ConfMan.registerDefault("fullscreen", false);

Modified: scummvm/trunk/base/gameDetector.h
===================================================================
--- scummvm/trunk/base/gameDetector.h	2006-05-04 22:52:18 UTC (rev 22344)
+++ scummvm/trunk/base/gameDetector.h	2006-05-04 22:55:15 UTC (rev 22345)
@@ -35,8 +35,8 @@
 	typedef Common::String String;
 
 public:
-	GameDetector();
-
+	static void registerDefaults();
+	
 	static Common::String parseCommandLine(Common::StringMap &settings, int argc, char **argv);
 	static void processSettings(Common::String &target, Common::StringMap &settings);
 	static const Plugin *detectMain();

Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2006-05-04 22:52:18 UTC (rev 22344)
+++ scummvm/trunk/base/main.cpp	2006-05-04 22:55:15 UTC (rev 22345)
@@ -323,6 +323,9 @@
 	// Verify that the backend has been initialized (i.e. g_system has been set).
 	assert(g_system);
 	OSystem &system = *g_system;
+	
+	// Register config manager defaults
+	GameDetector::registerDefaults();
 
 	// Parse the command line
 	Common::StringMap settings;


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