Fixed: #890 Ryzom Client Build Fix - _Bool is a keyword in C99 (patch provided by rti)

hg/feature/sound
kervala 15 years ago
parent e4653bbde9
commit 1c96de0be8

@ -48,7 +48,7 @@ void CInterfaceOptionValue::init(const std::string &str)
fromString(str, _Int); fromString(str, _Int);
fromString(str, _Float); fromString(str, _Float);
_Color= CInterfaceElement::convertColor (str.c_str()); _Color= CInterfaceElement::convertColor (str.c_str());
_Bool= CInterfaceElement::convertBool(str.c_str()); _Boolean= CInterfaceElement::convertBool(str.c_str());
} }

@ -37,14 +37,14 @@ public:
_Color= NLMISC::CRGBA::White; _Color= NLMISC::CRGBA::White;
_Int= 0; _Int= 0;
_Float= 0; _Float= 0;
_Bool= false; _Boolean= false;
} }
const std::string &getValStr () const {return _Str;} const std::string &getValStr () const {return _Str;}
sint32 getValSInt32() const {return _Int;} sint32 getValSInt32() const {return _Int;}
float getValFloat () const {return _Float;} float getValFloat () const {return _Float;}
NLMISC::CRGBA getValColor () const {return _Color;} NLMISC::CRGBA getValColor () const {return _Color;}
bool getValBool () const {return _Bool;} bool getValBool () const {return _Boolean;}
void init(const std::string &str); void init(const std::string &str);
@ -57,7 +57,7 @@ private:
NLMISC::CRGBA _Color; NLMISC::CRGBA _Color;
sint32 _Int; sint32 _Int;
float _Float; float _Float;
bool _Bool; bool _Boolean;
}; };

Loading…
Cancel
Save