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

Merge branch 'master' of https://github.com/metalgit92/cocos2d-x into metalgit92-master

This commit is contained in:
James Chen 2013-05-13 14:03:29 +08:00
parent 2ca0334765 71df5706bd
commit fa8daa2ebb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos2dx/base_nodes/CCNode.cpp
View File

@ -326,7 +326,7 @@ CCArray* CCNode::getChildren()
return m_pChildren; return m_pChildren;
} }
unsigned int CCNode::getChildrenCount(void) unsigned int CCNode::getChildrenCount(void) const
{ {
return m_pChildren ? m_pChildren->count() : 0; return m_pChildren ? m_pChildren->count() : 0;
} }
@ -392,7 +392,7 @@ void CCNode::setAnchorPoint(const CCPoint& point)
} }
/// contentSize getter /// contentSize getter
const CCSize& CCNode::getContentSize() const CCSize& CCNode::getContentSize() const
{ {
return m_obContentSize; return m_obContentSize;
} }
@ -441,7 +441,7 @@ void CCNode::ignoreAnchorPointForPosition(bool newValue)
} }
/// tag getter /// tag getter
int CCNode::getTag() int CCNode::getTag() const
{ {
return m_nTag; return m_nTag;
} }

6
cocos2dx/base_nodes/CCNode.h
View File

@ -412,7 +412,7 @@ public:
* *
* @return The untransformed size of the node. * @return The untransformed size of the node.
*/ */
virtual const CCSize& getContentSize(); virtual const CCSize& getContentSize() const;
/** /**
@ -608,7 +608,7 @@ public:
* *
* @return The amount of children. * @return The amount of children.
*/ */
unsigned int getChildrenCount(void); unsigned int getChildrenCount(void) const;
/** /**
* Sets the parent node * Sets the parent node
@ -757,7 +757,7 @@ public:
* *
* @return A interger that identifies the node. * @return A interger that identifies the node.
*/ */
virtual int getTag(); virtual int getTag() const;
/** /**
* Changes the tag that is used to identify the node easily. * Changes the tag that is used to identify the node easily.
* *