From f030154fe727e25a2afe1f78b3998c2d2dba95e4 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 18 Aug 2009 09:24:15 +0000 Subject: astyle cleanup, corrects not loading of material textures --- src/filesystem/inifile.cc | 75 ++++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 30 deletions(-) (limited to 'src/filesystem/inifile.cc') diff --git a/src/filesystem/inifile.cc b/src/filesystem/inifile.cc index c6cc625..52bf36d 100644 --- a/src/filesystem/inifile.cc +++ b/src/filesystem/inifile.cc @@ -11,7 +11,8 @@ #include -namespace filesystem { +namespace filesystem +{ IniFile::IniFile(const char *ininame) { @@ -25,7 +26,7 @@ IniFile::IniFile(const std::string & ininame) open(ininame.c_str()); } -IniFile::~IniFile() +IniFile::~IniFile() { if (inifile_stream.is_open()) inifile_stream.close(); @@ -65,19 +66,23 @@ bool IniFile::open(const char *ininame) } -bool IniFile::got_section() const { +bool IniFile::got_section() const +{ return last_read_was_section; } -bool IniFile::got_section(const char * sectionlabel) const { +bool IniFile::got_section(const char * sectionlabel) const +{ return (last_read_was_section && (section_current.compare(sectionlabel) == 0)); } -bool IniFile::in_section(const char * sectionlabel) const { +bool IniFile::in_section(const char * sectionlabel) const +{ return ((section_current.compare(sectionlabel) == 0)); } -bool IniFile::getline() { +bool IniFile::getline() +{ char line[1024]; last_read_was_section = false; @@ -103,7 +108,7 @@ bool IniFile::getline() { // section header if (s.size() > 2 && s[0] == '[' && s[s.size()-1] == ']') { // condebug << "Inifile got section header " << s << std::endl; - section_current = s.substr(1, s.size()-2); + section_current = s.substr(1, s.size() - 2); aux::trim(section_current); aux::to_lowercase(section_current); @@ -121,9 +126,9 @@ bool IniFile::getline() { aux::to_lowercase(key_current); if (key_current.size()) { - value_current = s.substr(found+1, s.size() - found - 1); - aux::trim (value_current); - last_read_was_key = true; + value_current = s.substr(found + 1, s.size() - found - 1); + aux::trim(value_current); + last_read_was_key = true; //con_debug << "IniFile got " << key_current << "=" << value_current << std::endl; return true; } @@ -140,8 +145,9 @@ bool IniFile::got_key() const return last_read_was_key; } -bool IniFile::got_key_string(const char * keylabel, std::string & valuestring) { - if (last_read_was_key && (key_current.compare(keylabel) == 0 )) { +bool IniFile::got_key_string(const char * keylabel, std::string & valuestring) +{ + if (last_read_was_key && (key_current.compare(keylabel) == 0)) { valuestring.assign(value_current); return true; } else { @@ -149,14 +155,15 @@ bool IniFile::got_key_string(const char * keylabel, std::string & valuestring) { } } -bool IniFile::got_key_vector3f(const char * keylabel, math::Vector3f & v) { - if (last_read_was_key && (key_current.compare(keylabel) == 0 )) { +bool IniFile::got_key_vector3f(const char * keylabel, math::Vector3f & v) +{ + if (last_read_was_key && (key_current.compare(keylabel) == 0)) { std::istringstream is(value_current); float x, y, z; if ((is >> x) && (is >> y) && (is >> z)) { - v = math::Vector3f(x,y,z); + v = math::Vector3f(x, y, z); } else { - v= math::Vector3f(); + v = math::Vector3f(); } return true; } else { @@ -164,8 +171,9 @@ bool IniFile::got_key_vector3f(const char * keylabel, math::Vector3f & v) { } } -bool IniFile::got_key_float(const char * keylabel, float & f) { - if (last_read_was_key && (key_current.compare(keylabel) == 0 )) { +bool IniFile::got_key_float(const char * keylabel, float & f) +{ + if (last_read_was_key && (key_current.compare(keylabel) == 0)) { std::istringstream is(value_current); if (!(is >> f)) { f = 0; @@ -176,8 +184,9 @@ bool IniFile::got_key_float(const char * keylabel, float & f) { } } -bool IniFile::got_key_long(const char * keylabel, long & l) { - if (last_read_was_key && (key_current.compare(keylabel) == 0 )) { +bool IniFile::got_key_long(const char * keylabel, long & l) +{ + if (last_read_was_key && (key_current.compare(keylabel) == 0)) { std::istringstream is(value_current); if (!(is >> l)) { l = 0; @@ -188,12 +197,14 @@ bool IniFile::got_key_long(const char * keylabel, long & l) { } } -bool IniFile::got_key(const char * keylabel) { - return (last_read_was_key && (key_current.compare(keylabel) == 0 )); +bool IniFile::got_key(const char * keylabel) +{ + return (last_read_was_key && (key_current.compare(keylabel) == 0)); } -bool IniFile::got_key_angle(const char * keylabel, float & f) { - if (last_read_was_key && (key_current.compare(keylabel) == 0 )) { +bool IniFile::got_key_angle(const char * keylabel, float & f) +{ + if (last_read_was_key && (key_current.compare(keylabel) == 0)) { std::istringstream is(value_current); if ((is >> f)) { f = math::degrees360f(f); @@ -206,8 +217,9 @@ bool IniFile::got_key_angle(const char * keylabel, float & f) { } } -bool IniFile::got_key_color(const char * keylabel, math::Color & color) { - if (last_read_was_key && (key_current.compare(keylabel) == 0 )) { +bool IniFile::got_key_color(const char * keylabel, math::Color & color) +{ + if (last_read_was_key && (key_current.compare(keylabel) == 0)) { std::istringstream is(value_current); float r, g, b, a; if ((is >> r) && (is >> g) && (is >> b)) { @@ -215,7 +227,9 @@ bool IniFile::got_key_color(const char * keylabel, math::Color & color) { if (is >> a) { a /= 255.0f; } - r /= 255.0f; g /= 255.0f; b /= 255.0f; + r /= 255.0f; + g /= 255.0f; + b /= 255.0f; } else { if (!(is >> a)) { a = 1.0f; @@ -233,12 +247,13 @@ bool IniFile::got_key_color(const char * keylabel, math::Color & color) { bool IniFile::got_key_bool(const char * keylabel, bool & b) { - if (last_read_was_key && (key_current.compare(keylabel) == 0 )) { + if (last_read_was_key && (key_current.compare(keylabel) == 0)) { std::istringstream is(value_current); unsigned int i; if (is >> i) { - if (i) b = true; else b = false; + if (i) b = true; + else b = false; return true; } @@ -266,7 +281,7 @@ bool IniFile::got_key_bool(const char * keylabel, bool & b) void IniFile::unknown_value() const { - con_warn << name() << " unknown value '" << value() << "' for key '" << key() << "' at line " << line() << std::endl; + con_warn << name() << " unknown value '" << value() << "' for key '" << key() << "' at line " << line() << std::endl; } void IniFile::unkown_key() const -- cgit v1.2.3