diff --git a/extensions/CCBReader/CCBValue.cpp b/extensions/CCBReader/CCBValue.cpp index dac5004f3a..051100383d 100644 --- a/extensions/CCBReader/CCBValue.cpp +++ b/extensions/CCBReader/CCBValue.cpp @@ -1,7 +1,5 @@ #include "CCBValue.h" -using namespace cocos2d; - NS_CC_EXT_BEGIN // Implementation of Color3BWapper @@ -14,10 +12,10 @@ Color3BWapper* Color3BWapper::create(const Color3B& color) ret->color.r = color.r; ret->color.g = color.g; ret->color.b = color.b; - + ret->autorelease(); } - + return ret; } @@ -34,10 +32,10 @@ CCBValue* CCBValue::create(int nValue) if (ret) { ret->_value.intValue = nValue; - ret->_type = Type::INT; + ret->_type = Type::INT; ret->autorelease(); } - + return ret; } @@ -47,10 +45,10 @@ CCBValue* CCBValue::create(float fValue) if (ret) { ret->_value.floatValue = fValue; - ret->_type = Type::FLOAT; + ret->_type = Type::FLOAT; ret->autorelease(); } - + return ret; } @@ -60,10 +58,10 @@ CCBValue* CCBValue::create(bool vValue) if (ret) { ret->_value.intValue = vValue ? 1 : 0; - ret->_type = Type::BOOL; + ret->_type = Type::BOOL; ret->autorelease(); } - + return ret; } @@ -73,10 +71,10 @@ CCBValue* CCBValue::create(unsigned char byte) if (ret) { ret->_value.intValue = byte; - ret->_type = Type::UNSIGNED_CHAR; + ret->_type = Type::UNSIGNED_CHAR; ret->autorelease(); } - + return ret; } @@ -86,10 +84,10 @@ CCBValue* CCBValue::create(const char *pStringValue) if (ret) { ret->_strValue = pStringValue; - ret->_type = Type::STRING; + ret->_type = Type::STRING; ret->autorelease(); } - + return ret; } @@ -103,51 +101,51 @@ CCBValue* CCBValue::create(Array *pArrValue) ret->_type = Type::ARRAY; ret->autorelease(); } - + return ret; } int CCBValue::getIntValue() { - CCASSERT(_type == Type::INT, "The type of CCBValue isn't integer."); - + CCASSERT(_type == Type::INT, "The type of CCBValue isn't integer."); + return _value.intValue; } float CCBValue::getFloatValue() { - CCASSERT(_type == Type::FLOAT, "The type of CCBValue isn't float."); - + CCASSERT(_type == Type::FLOAT, "The type of CCBValue isn't float."); + return _value.floatValue; } bool CCBValue::getBoolValue() { - CCASSERT(_type == Type::BOOL, "The type of CCBValue isn't boolean."); - + CCASSERT(_type == Type::BOOL, "The type of CCBValue isn't boolean."); + return _value.intValue == 1 ? true : false; } unsigned char CCBValue::getByteValue() { - CCASSERT(_type == Type::UNSIGNED_CHAR, "The type of CCBValue isn't unsigned char."); - + CCASSERT(_type == Type::UNSIGNED_CHAR, "The type of CCBValue isn't unsigned char."); + return (unsigned char)(_value.intValue); } Array* CCBValue::getArrayValue() { - CCASSERT(_type == Type::ARRAY, "The type of CCBValue isn't array."); - + CCASSERT(_type == Type::ARRAY, "The type of CCBValue isn't array."); + return _arrValue; } const char* CCBValue::getStringValue() { - CCASSERT(_type == Type::STRING, "The type of CCBValue isn't string."); - + CCASSERT(_type == Type::STRING, "The type of CCBValue isn't string."); + return _strValue.c_str(); }