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

Merge pull request #7062 from maldewar/v3 

Update _bPlaying on CCActionObject.
This commit is contained in:
minggo 2014-10-13 09:59:18 +08:00
parent b144eb345a e21dd9a10d
commit c330a0c668
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/editor-support/cocostudio/CCActionObject.cpp
View File

@ -237,6 +237,7 @@ void ActionObject::play(CallFunc* func)
void ActionObject::pause()
{
_bPause = true;
_bPlaying = false;
}
void ActionObject::stop()
@ -245,6 +246,7 @@ void ActionObject::stop()
{
e->stopAction();
}
_bPlaying = false;
_pScheduler->unschedule(CC_SCHEDULE_SELECTOR(ActionObject::simulationActionUpdate), this);
_bPause = false;
}
@ -283,6 +285,7 @@ void ActionObject::simulationActionUpdate(float dt)
}
else
{
_bPlaying = false;
_pScheduler->unschedule(CC_SCHEDULE_SELECTOR(ActionObject::simulationActionUpdate), this);
}
}