summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2006-11-04 23:51:54 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2006-11-04 23:51:54 +0000
commit2218984dce0119c491bb75aeea277a3682057a3b (patch)
treec5306783e8833f9d4cd0127ae12827732b8945a2 /src
parente4d5ea07c80df5e7423feed24ac21f8bc683acb6 (diff)
downloadmana-client-2218984dce0119c491bb75aeea277a3682057a3b.tar.gz
mana-client-2218984dce0119c491bb75aeea277a3682057a3b.tar.bz2
mana-client-2218984dce0119c491bb75aeea277a3682057a3b.tar.xz
mana-client-2218984dce0119c491bb75aeea277a3682057a3b.zip
src/main.cpp: Restore the homeDir config entry (temporarily).
Initialize the logger before libxml2.
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 5711600a..28128494 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -188,6 +188,7 @@ void initConfiguration(const Options &options)
config.setValue("fpslimit", 0);
config.setValue("updatehost", "http://themanaworld.org/files");
config.setValue("customcursor", 1);
+ config.setValue("homeDir", homeDir);
// Checking if the configuration file exists... otherwise create it with
// default options.
@@ -520,15 +521,16 @@ int main(int argc, char *argv[])
// Initialize PhysicsFS
PHYSFS_init(argv[0]);
- initXML();
initHomeDir();
- initConfiguration(options);
-
// Configure logger
logger = new Logger();
logger->setLogFile(homeDir + std::string("/tmw.log"));
logger->setLogToStandardOut(config.getValue("logToStandardOut", 0));
+ initXML();
+ initConfiguration(options);
+
+
// Log the tmw version
#ifdef PACKAGE_VERSION
logger->log("The Mana World v%s", PACKAGE_VERSION);