diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-04-15 08:49:26 -0400 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-04-15 08:49:26 -0400 |
| commit | 56fd6a9d86ac57580ec2b91cc98db31dda5f5770 (patch) | |
| tree | 359c86e617b993a07465dfc020a26704753a5320 /src/config.cpp | |
| parent | 8b0f74445b509d8e59ec89854f2e149ad1948d4e (diff) | |
Fixed segfaults
Diffstat (limited to 'src/config.cpp')
| -rw-r--r-- | src/config.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/config.cpp b/src/config.cpp index a2acc03..752b365 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -29,33 +29,33 @@ namespace config { xml.LoadFile("config/settings.xml"); scr = xml.FirstChildElement("screen"); - if(scr->QueryUnsignedAttribute("width",&uval) == XML_NO_ERROR) + if (scr->QueryUnsignedAttribute("width",&uval) == XML_NO_ERROR) SCREEN_WIDTH = uval; else SCREEN_WIDTH = 1280; - if(scr->QueryUnsignedAttribute("height",&uval) == XML_NO_ERROR) + if (scr->QueryUnsignedAttribute("height",&uval) == XML_NO_ERROR) SCREEN_HEIGHT = uval; else SCREEN_HEIGHT = 800; - if(scr->QueryBoolAttribute("fullscreen",&bval) == XML_NO_ERROR) + if (scr->QueryBoolAttribute("fullscreen",&bval) == XML_NO_ERROR) FULLSCREEN = bval; else FULLSCREEN = false; - if(xml.FirstChildElement("hline")->QueryUnsignedAttribute("size",&uval) == XML_NO_ERROR) + if (xml.FirstChildElement("hline")->QueryUnsignedAttribute("size",&uval) == XML_NO_ERROR) HLINE = uval; else HLINE = 3; vol = xml.FirstChildElement("volume"); - if(vol->FirstChildElement("master")->QueryFloatAttribute("volume",&fval) == XML_NO_ERROR) + if (vol->FirstChildElement("master")->QueryFloatAttribute("volume",&fval) == XML_NO_ERROR) VOLUME_MASTER = fval; else VOLUME_MASTER = 50; - if(vol->FirstChildElement("music")->QueryFloatAttribute("volume",&fval) == XML_NO_ERROR) + if (vol->FirstChildElement("music")->QueryFloatAttribute("volume",&fval) == XML_NO_ERROR) VOLUME_MUSIC = fval; else VOLUME_MUSIC = 50; - if(vol->FirstChildElement("sfx")->QueryFloatAttribute("volume",&fval) == XML_NO_ERROR) + if (vol->FirstChildElement("sfx")->QueryFloatAttribute("volume",&fval) == XML_NO_ERROR) VOLUME_SFX = fval; else VOLUME_SFX = 50; xmlFolder = xml.FirstChildElement("world")->Attribute("start"); - if(xmlFolder=="\0")xmlFolder = "xml/"; + if (xmlFolder=="\0")xmlFolder = "xml/"; std::cout << "Folder: " << xmlFolder << std::endl; ui::initFonts(); |