summaryrefslogtreecommitdiff
path: root/src/progs/manaplus
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-27 04:00:36 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-27 04:00:36 +0300
commit1614644f5367a7a17fb5bc754b1ee47561d5905b (patch)
tree22ddb02f9927d03ebb515561559ccbfbf97fde1f /src/progs/manaplus
parent003043714367009efaf07015cc63a901ae2ee47c (diff)
downloadmanaverse-1614644f5367a7a17fb5bc754b1ee47561d5905b.tar.gz
manaverse-1614644f5367a7a17fb5bc754b1ee47561d5905b.tar.bz2
manaverse-1614644f5367a7a17fb5bc754b1ee47561d5905b.tar.xz
manaverse-1614644f5367a7a17fb5bc754b1ee47561d5905b.zip
Remove default parameters from configuration.
Diffstat (limited to 'src/progs/manaplus')
-rw-r--r--src/progs/manaplus/client.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp
index 380453c19..89de4cb5b 100644
--- a/src/progs/manaplus/client.cpp
+++ b/src/progs/manaplus/client.cpp
@@ -282,7 +282,11 @@ void Client::gameInit()
assertListener = new AssertListener;
// Load branding information
if (!settings.options.brandingPath.empty())
- branding.init(settings.options.brandingPath);
+ {
+ branding.init(settings.options.brandingPath,
+ UseVirtFs_false,
+ SkipError_false);
+ }
setBrandingDefaults(branding);
Dirs::initRootDir();
@@ -1907,7 +1911,9 @@ void Client::loadData()
}
logger->log("Init paths");
- paths.init("paths.xml", UseVirtFs_true);
+ paths.init("paths.xml",
+ UseVirtFs_true,
+ SkipError_false);
setPathsDefaults(paths);
initPaths();
if (SpriteReference::Empty == nullptr)