summaryrefslogtreecommitdiff
path: root/src/common/configuration.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2011-11-01 13:44:38 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2011-11-01 17:13:46 +0100
commit5922e27d2bc4d2b5ab906afbe2bc029ac90cb2ed (patch)
tree19d2d94b8c90ccb9a24529102431e6a68c0b7a4b /src/common/configuration.h
parentfba5a19e5885e3f4ddca2c249a96fbbe24c846b8 (diff)
downloadmanaserv-5922e27d2bc4d2b5ab906afbe2bc029ac90cb2ed.tar.gz
manaserv-5922e27d2bc4d2b5ab906afbe2bc029ac90cb2ed.tar.bz2
manaserv-5922e27d2bc4d2b5ab906afbe2bc029ac90cb2ed.tar.xz
manaserv-5922e27d2bc4d2b5ab906afbe2bc029ac90cb2ed.zip
Have one place where the Configuration is initialized
Also, removed the fallback to the standard config file path when a config file path is specified on the command line. Surely that's not what you would want to happen. Reviewed-by: Yohann Ferreira
Diffstat (limited to 'src/common/configuration.h')
-rw-r--r--src/common/configuration.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/configuration.h b/src/common/configuration.h
index dbb0a7d4..e7fe8edd 100644
--- a/src/common/configuration.h
+++ b/src/common/configuration.h
@@ -28,10 +28,12 @@ namespace Configuration
{
/**
* Loads the configuration options into memory.
- * @param filename path to the configuration file .
+ *
+ * @param filename path to the configuration file. When empty, the default
+ * config file 'manaserv.xml' is used.
* @return whether the configuration file could be read
*/
- bool initialize(const std::string &filename);
+ bool initialize(const std::string &fileName = std::string());
void deinitialize();