aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 01:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
kervala 2010-05-12 16:15:48 +02:00
parent e4653bbde9
commit 1c96de0be8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/client/src/interface_v3/interface_options.cpp
View file

@ -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());
} }

6
code/ryzom/client/src/interface_v3/interface_options.h
View file

@ -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;
}; };