summaryrefslogtreecommitdiff
path: root/src/defaults.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-01-11 01:34:11 +0200
committerAndrei Karas <akaras@inbox.ru>2011-01-11 01:34:11 +0200
commitfcced13d9972ac70f0f01f19583b7868e255b6a7 (patch)
tree9b01df102c5f9ba032ea0f9bc413dd707e99d88b /src/defaults.cpp
parent311783bebbe2bed366dca5097697ce34c690292d (diff)
parentef1b9856c86512fe73154c17da3ea98a7cd5f896 (diff)
downloadmanaplus-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.gz
manaplus-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.bz2
manaplus-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.xz
manaplus-fcced13d9972ac70f0f01f19583b7868e255b6a7.zip
Merge branch 'master' into invfiler
Diffstat (limited to 'src/defaults.cpp')
-rw-r--r--src/defaults.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 0628aa72c..da5aa4e84 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -189,6 +189,8 @@ DefaultsData* getConfigDefaults()
AddDEF(configData, "enableBattleTab", false);
AddDEF(configData, "showBattleEvents", false);
AddDEF(configData, "showMobHP", true);
+ AddDEF(configData, "showOwnHP", true);
+ AddDEF(configData, "usePersistentIP", false);
return configData;
}
@@ -219,6 +221,8 @@ DefaultsData* getBrandingDefaults()
AddDEF(brandingData, "guiPath", "graphics/gui/");
AddDEF(brandingData, "guiThemePath", "themes/");
AddDEF(brandingData, "fontsPath", "fonts/");
+
+ AddDEF(brandingData, "wallpaperFile", "");
return brandingData;
}