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

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv1455

Modified Files:
	config-manager.cpp config-manager.h 
Log Message:
fixed ConfigManager getInt/getBool

Index: config-manager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- config-manager.cpp	7 Nov 2003 15:57:36 -0000	1.10
+++ config-manager.cpp	7 Nov 2003 16:54:58 -0000	1.11
@@ -213,7 +213,7 @@
 	
 //	if (_transientDomain.contain(key))
 //		return true;
-	
+
 	if (!_activeDomain.isEmpty() && _gameDomains[_activeDomain].contains(key))
 		return true;
 	
@@ -222,7 +222,7 @@
 		if (iter->_value.contains(key))
 			return true;
 	}
-	
+
 	return false;
 }
 
@@ -252,10 +252,6 @@
 #pragma mark -
 
 
-const String & ConfigManager::get(const String &key) const {
-	return get(key, _activeDomain);
-}
-
 const String & ConfigManager::get(const String &key, const String &dom) const {
 	// Search the domains in the following order:
 	// 1) Run time domain
@@ -266,8 +262,11 @@
 //	if (_transientDomain.contain(key))
 //		return true;
 	
-	if (!dom.isEmpty() && _gameDomains.contains(dom) && _gameDomains[dom].contains(key))
-		return _gameDomains[dom][key];
+	if (!dom.isEmpty()) {
+		if (_gameDomains.contains(dom) && _gameDomains[dom].contains(key))
+			return _gameDomains[dom][key];
+	} else if (!_activeDomain.isEmpty() && _gameDomains[_activeDomain].contains(key))
+		return _gameDomains[_activeDomain][key];
 
 	DomainMap::ConstIterator iter;
 	for (iter = _globalDomains.begin(); iter != _globalDomains.end(); ++iter) {
@@ -282,10 +281,7 @@
 	String value(get(key, dom));
 	// Convert the string to an integer.
 	// TODO: We should perform some error checking.
-	if (value.c_str())
-		return (int)strtol(value.c_str(), 0, 10);
-	else
-		return 0;
+	return (int)strtol(value.c_str(), 0, 10);
 }
 
 bool ConfigManager::getBool(const String &key, const String &dom) const {

Index: config-manager.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config-manager.h	7 Nov 2003 00:45:54 -0000	1.6
+++ config-manager.h	7 Nov 2003 16:54:58 -0000	1.7
@@ -63,8 +63,7 @@
 
 	void				removeKey(const String &key, const String &dom);
 
-	const String &		get(const String &key) const;
-	const String &		get(const String &key, const String &dom) const;
+	const String &		get(const String &key, const String &dom = String::emptyString) const;
 	int					getInt(const String &key, const String &dom = String::emptyString) const;
 	bool				getBool(const String &key, const String &dom = String::emptyString) const;