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

Merged pull request #240 from natural-law/master. 

issue #428
This commit is contained in:
minggo 2011-04-27 19:38:09 -07:00
parent 2cceeb5c39 15ef0b9105
commit 963c271120
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/base_nodes/CCNode.cpp
View File

@ -107,7 +107,7 @@ void CCNode::arrayMakeObjectsPerformSelector(CCArray* pArray, callbackFunc func)
if(pArray && pArray->count() > 0) if(pArray && pArray->count() > 0)
{ {
CCObject* child; CCObject* child;
CCARRAY_FOREACH(m_pChildren, child) CCARRAY_FOREACH(pArray, child)
{ {
CCNode* pNode = (CCNode*) child; CCNode* pNode = (CCNode*) child;
if(pNode && func) if(pNode && func)

14
cocos2dx/sprite_nodes/CCSpriteBatchNode.cpp
View File

@ -288,7 +288,7 @@ namespace cocos2d
if (m_pobDescendants && m_pobDescendants->count() > 0) if (m_pobDescendants && m_pobDescendants->count() > 0)
{ {
CCObject* pObject = NULL; CCObject* pObject = NULL;
CCARRAY_FOREACH(m_pChildren, pObject) CCARRAY_FOREACH(m_pobDescendants, pObject)
{ {
CCSprite* pChild = (CCSprite*) pObject; CCSprite* pChild = (CCSprite*) pObject;
if (pChild) if (pChild)
@ -353,7 +353,7 @@ namespace cocos2d
if (pChildren && pChildren->count() > 0) if (pChildren && pChildren->count() > 0)
{ {
CCObject* pObject = NULL; CCObject* pObject = NULL;
CCARRAY_FOREACH(m_pChildren, pObject) CCARRAY_FOREACH(pChildren, pObject)
{ {
CCSprite* pChild = (CCSprite*) pObject; CCSprite* pChild = (CCSprite*) pObject;
if (pChild && (pChild->getZOrder() < 0)) if (pChild && (pChild->getZOrder() < 0))
@ -373,7 +373,7 @@ namespace cocos2d
if (pChildren && pChildren->count() > 0) if (pChildren && pChildren->count() > 0)
{ {
CCObject* pObject = NULL; CCObject* pObject = NULL;
CCARRAY_FOREACH(m_pChildren, pObject) CCARRAY_FOREACH(pChildren, pObject)
{ {
CCSprite* pChild = (CCSprite*) pObject; CCSprite* pChild = (CCSprite*) pObject;
if (pChild && (pChild->getZOrder() >= 0)) if (pChild && (pChild->getZOrder() >= 0))
@ -496,7 +496,7 @@ namespace cocos2d
if (m_pobDescendants && m_pobDescendants->count() > 0) if (m_pobDescendants && m_pobDescendants->count() > 0)
{ {
CCObject* pObject = NULL; CCObject* pObject = NULL;
CCARRAY_FOREACH(m_pChildren, pObject) CCARRAY_FOREACH(m_pobDescendants, pObject)
{ {
CCSprite* pChild = (CCSprite*) pObject; CCSprite* pChild = (CCSprite*) pObject;
if (pChild) if (pChild)
@ -516,7 +516,7 @@ namespace cocos2d
if (pChildren && pChildren->count() > 0) if (pChildren && pChildren->count() > 0)
{ {
CCObject* pObject = NULL; CCObject* pObject = NULL;
CCARRAY_FOREACH(m_pChildren, pObject) CCARRAY_FOREACH(pChildren, pObject)
{ {
CCSprite* pChild = (CCSprite*) pObject; CCSprite* pChild = (CCSprite*) pObject;
if (pChild) if (pChild)
@ -556,7 +556,7 @@ namespace cocos2d
if (pChildren && pChildren->count() > 0) if (pChildren && pChildren->count() > 0)
{ {
CCObject* pObject = NULL; CCObject* pObject = NULL;
CCARRAY_FOREACH(m_pChildren, pObject) CCARRAY_FOREACH(pChildren, pObject)
{ {
CCSprite* pChild = (CCSprite*) pObject; CCSprite* pChild = (CCSprite*) pObject;
if (pChild) if (pChild)
@ -639,7 +639,7 @@ namespace cocos2d
if (m_pobDescendants && m_pobDescendants->count() > 0) if (m_pobDescendants && m_pobDescendants->count() > 0)
{ {
CCObject* pObject = NULL; CCObject* pObject = NULL;
CCARRAY_FOREACH(m_pChildren, pObject) CCARRAY_FOREACH(m_pobDescendants, pObject)
{ {
CCSprite* pChild = (CCSprite*) pObject; CCSprite* pChild = (CCSprite*) pObject;
if (pChild && (pChild->getAtlasIndex() >= z)) if (pChild && (pChild->getAtlasIndex() >= z))