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

fix bugs in CCDictionary::objectForKey(int/string)

This commit is contained in:
walzer 2012-10-04 09:03:22 +08:00
parent 16afe5b616
commit f1b87ef0e9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos2dx/cocoa/CCDictionary.cpp
View File

@ -93,10 +93,11 @@ CCObject* CCDictionary::objectForKey(const std::string& key)
{ {
if (m_eDictType != kCCDictStr) if (m_eDictType != kCCDictStr)
{ {
CCAssert(m_eDictType == kCCDictStr, "this dictionary does not use string as key.");
return NULL; return NULL;
} }
CCAssert(m_eDictType == kCCDictStr, "this dictionary does not use string as key.");
CCObject* pRetObject = NULL; CCObject* pRetObject = NULL;
CCDictElement *pElement = NULL; CCDictElement *pElement = NULL;
HASH_FIND_STR(m_pElements, key.c_str(), pElement); HASH_FIND_STR(m_pElements, key.c_str(), pElement);
@ -111,10 +112,11 @@ CCObject* CCDictionary::objectForKey(int key)
{ {
if (m_eDictType != kCCDictInt) if (m_eDictType != kCCDictInt)
{ {
CCAssert(m_eDictType == kCCDictInt, "this dictionary does not use integer as key.");
return NULL; return NULL;
} }
CCAssert(m_eDictType == kCCDictInt, "this dictionary does not use integer as key.");
CCObject* pRetObject = NULL; CCObject* pRetObject = NULL;
CCDictElement *pElement = NULL; CCDictElement *pElement = NULL;
HASH_FIND_INT(m_pElements, &key, pElement); HASH_FIND_INT(m_pElements, &key, pElement);