aboutsummaryrefslogtreecommitdiffstats
path: root/src/config.cpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-04-04 07:32:55 -0400
committerClyne Sullivan <tullivan99@gmail.com>2016-04-04 07:32:55 -0400
commitc74d256646cf0c438feee2ac703cc1f34b47b8ec (patch)
treeaf9ec2469bce263c53ce6adc8d9385750eab3ead /src/config.cpp
parent260c617673ab332bf2a3531db45bd264668d1b98 (diff)
parenta45daeda3633bdf25267a0186b39618269dca970 (diff)
Merge branch 'master' of https://github.com/tcsullivan/gamedev
Diffstat (limited to 'src/config.cpp')
-rw-r--r--src/config.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/config.cpp b/src/config.cpp
index 4f4ad89..2ee13d4 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -13,6 +13,8 @@ extern float VOLUME_MASTER;
extern float VOLUME_MUSIC;
extern float VOLUME_SFX;
+extern std::string xmlFolder;
+
XMLDocument xml;
XMLElement *scr;
XMLElement *vol;
@@ -52,6 +54,10 @@ namespace config {
VOLUME_SFX = fval;
else VOLUME_SFX = 50;
+ xmlFolder = xml.FirstChildElement("world")->Attribute("start");
+ if(xmlFolder=="\0")xmlFolder = "xml/";
+ std::cout << "Folder: " << xmlFolder << std::endl;
+
ui::initFonts();
ui::setFontFace(xml.FirstChildElement("font")->Attribute("path"));
config::update();