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

prefixing ivars

This commit is contained in:
mannewalis 2014-07-03 10:16:10 -07:00
parent 96605f801c
commit 4b1f2ccc91
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cocos/2d/CCNode.cpp
View File

@ -1310,8 +1310,8 @@ Mat4 Node::transform(const Mat4& parentTransform)
void Node::onEnter() void Node::onEnter()
{ {
if (onEnterCallback) if (_onEnterCallback)
onEnterCallback(); _onEnterCallback();
#if CC_ENABLE_SCRIPT_BINDING #if CC_ENABLE_SCRIPT_BINDING
if (_scriptType == kScriptTypeJavascript) if (_scriptType == kScriptTypeJavascript)
@ -1340,8 +1340,8 @@ void Node::onEnter()
void Node::onEnterTransitionDidFinish() void Node::onEnterTransitionDidFinish()
{ {
if (onEnterTransitionDidFinishCallback) if (_onEnterTransitionDidFinishCallback)
onEnterTransitionDidFinishCallback(); _onEnterTransitionDidFinishCallback();
#if CC_ENABLE_SCRIPT_BINDING #if CC_ENABLE_SCRIPT_BINDING
if (_scriptType == kScriptTypeJavascript) if (_scriptType == kScriptTypeJavascript)
@ -1365,8 +1365,8 @@ void Node::onEnterTransitionDidFinish()
void Node::onExitTransitionDidStart() void Node::onExitTransitionDidStart()
{ {
if (onExitTransitionDidStartCallback) if (_onExitTransitionDidStartCallback)
onExitTransitionDidStartCallback(); _onExitTransitionDidStartCallback();
#if CC_ENABLE_SCRIPT_BINDING #if CC_ENABLE_SCRIPT_BINDING
if (_scriptType == kScriptTypeJavascript) if (_scriptType == kScriptTypeJavascript)
@ -1389,8 +1389,8 @@ void Node::onExitTransitionDidStart()
void Node::onExit() void Node::onExit()
{ {
if (onExitCallback) if (_onExitCallback)
onExitCallback(); _onExitCallback();
#if CC_ENABLE_SCRIPT_BINDING #if CC_ENABLE_SCRIPT_BINDING
if (_scriptType == kScriptTypeJavascript) if (_scriptType == kScriptTypeJavascript)