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

Merge pull request #1485 from mingulov/menu_cast 

CCMenu - prevent a crash if some child item is not CCMenuItem
This commit is contained in:
minggo 2012-10-21 19:18:20 -07:00
parent 77c2f530f3 d4f65b5348
commit 677ba22b5c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos2dx/menu_nodes/CCMenu.cpp
View File

@ -652,16 +652,16 @@ CCMenuItem* CCMenu::itemForTouch(CCTouch *touch)
CCObject* pObject = NULL; CCObject* pObject = NULL;
CCARRAY_FOREACH(m_pChildren, pObject) CCARRAY_FOREACH(m_pChildren, pObject)
{ {
CCNode* pChild = dynamic_cast<CCNode*>(pObject); CCMenuItem* pChild = dynamic_cast<CCMenuItem*>(pObject);
if (pChild && pChild->isVisible() && ((CCMenuItem*)pChild)->isEnabled()) if (pChild && pChild->isVisible() && pChild->isEnabled())
{ {
CCPoint local = pChild->convertToNodeSpace(touchLocation); CCPoint local = pChild->convertToNodeSpace(touchLocation);
CCRect r = ((CCMenuItem*)pChild)->rect(); CCRect r = pChild->rect();
r.origin = CCPointZero; r.origin = CCPointZero;
if (r.containsPoint(local)) if (r.containsPoint(local))
{ {
return (CCMenuItem*)pChild; return pChild;
} }
} }
} }