ryzom_client_bool_name_problem_option_2.patch
b/code/ryzom/client/src/interface_v3/interface_options.cpp Wed May 12 14:06:58 2010 +0200 | ||
---|---|---|
48 | 48 |
fromString(str, _Int); |
49 | 49 |
fromString(str, _Float); |
50 | 50 |
_Color= CInterfaceElement::convertColor (str.c_str()); |
51 |
_Bool= CInterfaceElement::convertBool(str.c_str()); |
|
51 |
_Boolean= CInterfaceElement::convertBool(str.c_str());
|
|
52 | 52 |
} |
53 | 53 | |
54 | 54 |
b/code/ryzom/client/src/interface_v3/interface_options.h Wed May 12 14:06:58 2010 +0200 | ||
---|---|---|
37 | 37 |
_Color= NLMISC::CRGBA::White; |
38 | 38 |
_Int= 0; |
39 | 39 |
_Float= 0; |
40 |
_Bool= false; |
|
40 |
_Boolean= false;
|
|
41 | 41 |
} |
42 | 42 | |
43 | 43 |
const std::string &getValStr () const {return _Str;} |
44 | 44 |
sint32 getValSInt32() const {return _Int;} |
45 | 45 |
float getValFloat () const {return _Float;} |
46 | 46 |
NLMISC::CRGBA getValColor () const {return _Color;} |
47 |
bool getValBool () const {return _Bool;} |
|
47 |
bool getValBool () const {return _Boolean;}
|
|
48 | 48 | |
49 | 49 |
void init(const std::string &str); |
50 | 50 | |
... | ... | |
57 | 57 |
NLMISC::CRGBA _Color; |
58 | 58 |
sint32 _Int; |
59 | 59 |
float _Float; |
60 |
bool _Bool; |
|
60 |
bool _Boolean;
|
|
61 | 61 |
}; |
62 | 62 | |
63 | 63 |