diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-03-30 08:41:16 -0400 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-03-30 08:41:16 -0400 |
| commit | c35571e37bdd6d2fe9b95e4265c150265585f3a9 (patch) | |
| tree | 31478f777e27f345cc20f2eaf796a176b55cb4fe /src/config.cpp | |
| parent | 82c178d797b9a23c31d7dad1cc8cac29d27c6eb1 (diff) | |
Inv and textures
Diffstat (limited to 'src/config.cpp')
| -rw-r--r-- | src/config.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/config.cpp b/src/config.cpp index 45bab3f..5f297b7 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -1,6 +1,6 @@ -#include <config.h> +#include <config.hpp> -#include <ui.h> +#include <ui.hpp> using namespace tinyxml2; @@ -24,7 +24,7 @@ void readConfig(){ xml.LoadFile("config/settings.xml"); scr = xml.FirstChildElement("screen"); - + if(scr->QueryUnsignedAttribute("width",&uval) == XML_NO_ERROR) SCREEN_WIDTH = uval; else SCREEN_WIDTH = 1280; @@ -39,7 +39,7 @@ void readConfig(){ else HLINE = 3; vol = xml.FirstChildElement("volume"); - + if(vol->FirstChildElement("master")->QueryFloatAttribute("volume",&fval) == XML_NO_ERROR) VOLUME_MASTER = fval; else VOLUME_MASTER = 50; @@ -49,7 +49,7 @@ void readConfig(){ if(vol->FirstChildElement("sfx")->QueryFloatAttribute("volume",&fval) == XML_NO_ERROR) VOLUME_SFX = fval; else VOLUME_SFX = 50; - + ui::initFonts(); ui::setFontFace(xml.FirstChildElement("font")->Attribute("path")); updateConfig(); |