summaryrefslogtreecommitdiff
path: root/src/client.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-31 01:34:38 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-31 01:34:38 +0300
commite826d4c63365dde4c988453846437dcb65370945 (patch)
tree1bd23d4694c06d97e7e8c885253c0100fe6142b9 /src/client.cpp
parent75ca03c95c90064e67fa9eaddb4c609196dd3a27 (diff)
downloadplus-e826d4c63365dde4c988453846437dcb65370945.tar.gz
plus-e826d4c63365dde4c988453846437dcb65370945.tar.bz2
plus-e826d4c63365dde4c988453846437dcb65370945.tar.xz
plus-e826d4c63365dde4c988453846437dcb65370945.zip
Improve setting default values for configuration objects.
Diffstat (limited to 'src/client.cpp')
-rw-r--r--src/client.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/client.cpp b/src/client.cpp
index b59033213..c9c1ad976 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -279,7 +279,7 @@ void Client::gameInit()
// Load branding information
if (!settings.options.brandingPath.empty())
branding.init(settings.options.brandingPath);
- branding.setDefaultValues(getBrandingDefaults());
+ setBrandingDefaults(branding);
Dirs::initRootDir();
Dirs::initHomeDir();
@@ -308,7 +308,7 @@ void Client::gameInit()
ConfigManager::initConfiguration();
settings.init();
Net::loadIgnorePackets();
- paths.setDefaultValues(getPathsDefaults());
+ setPathsDefaults(paths);
initFeatures();
initPaths();
logger->log("init 4");
@@ -595,7 +595,7 @@ void Client::initGraphics()
graphicsManager.initGraphics();
imageHelper->postInit();
- getConfigDefaults2(config.getDefaultValues());
+ setConfigDefaults2(config);
WindowManager::applyGrabMode();
WindowManager::applyGamma();
@@ -1720,7 +1720,7 @@ void Client::initFeatures()
features.init(paths.getStringValue("featuresFile"),
UseVirtFs_true,
SkipError_true);
- features.setDefaultValues(getFeaturesDefaults());
+ setFeaturesDefaults(features);
settings.fixDeadAnimation = features.getBoolValue("fixDeadAnimation");
}
@@ -1896,7 +1896,7 @@ void Client::loadData()
logger->log("Init paths");
paths.init("paths.xml", UseVirtFs_true);
- paths.setDefaultValues(getPathsDefaults());
+ setPathsDefaults(paths);
initPaths();
if (SpriteReference::Empty == nullptr)
{