diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-12-27 04:00:36 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-12-27 04:00:36 +0300 |
| commit | 1614644f5367a7a17fb5bc754b1ee47561d5905b (patch) | |
| tree | 22ddb02f9927d03ebb515561559ccbfbf97fde1f /src/progs | |
| parent | 003043714367009efaf07015cc63a901ae2ee47c (diff) | |
| download | manaplus-1614644f5367a7a17fb5bc754b1ee47561d5905b.tar.gz manaplus-1614644f5367a7a17fb5bc754b1ee47561d5905b.tar.bz2 manaplus-1614644f5367a7a17fb5bc754b1ee47561d5905b.tar.xz manaplus-1614644f5367a7a17fb5bc754b1ee47561d5905b.zip | |
Remove default parameters from configuration.
Diffstat (limited to 'src/progs')
| -rw-r--r-- | src/progs/dyecmd/client.cpp | 10 | ||||
| -rw-r--r-- | src/progs/manaplus/client.cpp | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/progs/dyecmd/client.cpp b/src/progs/dyecmd/client.cpp index 7046be25d..199f91ecd 100644 --- a/src/progs/dyecmd/client.cpp +++ b/src/progs/dyecmd/client.cpp @@ -163,7 +163,11 @@ void Client::gameInit() // 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(); @@ -683,7 +687,9 @@ int Client::gameExec() } logger->log("Init paths"); - paths.init("paths.xml", UseVirtFs_true); + paths.init("paths.xml", + UseVirtFs_true, + SkipError_false); setPathsDefaults(paths); initPaths(); TranslationManager::loadCurrentLang(); 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) |