Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2672 from ricardoquesada/configuration_get_value_fix 

Adds support for "CCString" types for boolean and integers
This commit is contained in:
minggo 2013-05-29 19:05:30 -07:00
parent 05db67e8ae 827fa638ca
commit 038cc86537
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cocos2dx/CCConfiguration.cpp
View File

@ -240,8 +240,10 @@ bool CCConfiguration::getBool( const char *key ) const
{ {
CCObject *ret = m_pDefaults->objectForKey(key); CCObject *ret = m_pDefaults->objectForKey(key);
if( ret ) { if( ret ) {
if( CCBool *obj=dynamic_cast<CCBool*>(ret) ) if( CCBool *boolobj=dynamic_cast<CCBool*>(ret) )
return obj->getValue(); return boolobj->getValue();
if( CCString *strobj=dynamic_cast<CCString*>(ret) )
return strobj->boolValue();
CCAssert(false, "Key found, but from different type"); CCAssert(false, "Key found, but from different type");
} }
@ -261,6 +263,9 @@ double CCConfiguration::getNumber( const char *key ) const
if( CCInteger *obj=dynamic_cast<CCInteger*>(ret) ) if( CCInteger *obj=dynamic_cast<CCInteger*>(ret) )
return obj->getValue(); return obj->getValue();
if( CCString *strobj=dynamic_cast<CCString*>(ret) )
return strobj->doubleValue();
CCAssert(false, "Key found, but from different type"); CCAssert(false, "Key found, but from different type");
} }