From 523ef5835f16ece38600b91f84936b7b0d2845a1 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Wed, 3 Feb 2016 08:45:55 -0500 Subject: bug fixess --- src/config.cpp | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'src/config.cpp') diff --git a/src/config.cpp b/src/config.cpp index 0ed39fd..9f9b05e 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -15,12 +15,31 @@ XMLDocument xml; void readConfig(void){ XMLElement *scr; XMLElement *vol; + + unsigned int uval; + bool bval; + //float fval; + xml.LoadFile("config/settings.xml"); scr = xml.FirstChildElement("screen"); - SCREEN_WIDTH = scr->UnsignedAttribute("width"); + + if(scr->QueryUnsignedAttribute("width",&uval) == XML_NO_ERROR) + SCREEN_WIDTH = uval; + else SCREEN_WIDTH = 1280; + if(scr->QueryUnsignedAttribute("height",&uval) == XML_NO_ERROR) + SCREEN_HEIGHT = uval; + else SCREEN_HEIGHT = 800; + if(scr->QueryBoolAttribute("fullscreen",&bval) == XML_NO_ERROR) + FULLSCREEN = bval; + else FULLSCREEN = false; + if(xml.FirstChildElement("hline")->QueryUnsignedAttribute("size",&uval) == XML_NO_ERROR) + HLINE = uval; + else HLINE = 3; + + /*SCREEN_WIDTH = scr->UnsignedAttribute("width"); SCREEN_HEIGHT = scr->UnsignedAttribute("height"); FULLSCREEN = scr->BoolAttribute("fullscreen"); - HLINE = xml.FirstChildElement("hline")->UnsignedAttribute("size"); + HLINE = xml.FirstChildElement("hline")->UnsignedAttribute("size");*/ vol = xml.FirstChildElement("volume"); VOLUME_MASTER = vol->FirstChildElement("master")->FloatAttribute("volume"); -- cgit v1.2.3