[Scummvm-cvs-logs] CVS: scummvm/common config-manager.cpp,1.16,1.17 config-manager.h,1.10,1.11

[James Brown]

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

Modified Files:
	config-manager.cpp config-manager.h 
Log Message:
Add -c/--config option to specific alternate configuration file. Sorry Max, but it's damn useful for coverdiscs :)


Index: config-manager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- config-manager.cpp	5 Feb 2004 00:19:54 -0000	1.16
+++ config-manager.cpp	7 Feb 2004 04:53:59 -0000	1.17
@@ -86,6 +86,14 @@
 	#endif
 #endif
 
+	switchFile(configFile);
+}
+
+void ConfigManager::switchFile(const String &filename) {
+	_globalDomains.clear();
+	_gameDomains.clear();
+	_transientDomain.clear();
+
 	// Ensure the global domain(s) are setup.
 	_globalDomains.addKey(kApplicationDomain);
 #ifdef _WIN32_WCE
@@ -94,8 +102,9 @@
 	_globalDomains.addKey("smartfon-keys");
 #endif
 
-	_filename = configFile;
+	_filename = filename;
 	loadFile(_filename);
+	printf("Switched to configuration %s\n", _filename.c_str());
 }
 
 void ConfigManager::loadFile(const String &filename) {

Index: config-manager.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- config-manager.h	6 Jan 2004 12:45:27 -0000	1.10
+++ config-manager.h	7 Feb 2004 04:53:59 -0000	1.11
@@ -61,6 +61,8 @@
 	/** The transient (pseudo) domain. */
 	static const String kTransientDomain;
 
+	void				switchFile(const String &filename);
+
 	bool				hasKey(const String &key) const;
 	bool				hasKey(const String &key, const String &dom) const;