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

issue #531, Merge liswei/issue531 manually.

This commit is contained in:
Walzer 2011-06-22 17:13:01 +08:00
parent 96996d4d52
commit 67ac46647f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos2dx/CCScheduler.cpp
View File

@ -157,7 +157,7 @@ void CCTimer::update(ccTime dt)
if (m_fElapsed >= m_fInterval) if (m_fElapsed >= m_fInterval)
{ {
if (m_pfnSelector) if (NULL != m_pfnSelector)
{ {
(m_pTarget->*m_pfnSelector)(m_fElapsed); (m_pTarget->*m_pfnSelector)(m_fElapsed);
m_fElapsed = 0; m_fElapsed = 0;
@ -248,7 +248,6 @@ void CCScheduler::scheduleTimer(CCTimer *pTimer)
void CCScheduler::unscheduleTimer(CCTimer *pTimer) void CCScheduler::unscheduleTimer(CCTimer *pTimer)
{ {
//CC_UNUSED_PARAM(pTimer);
pTimer = NULL; pTimer = NULL;
assert(false); assert(false);
} }
@ -260,7 +259,7 @@ void CCScheduler::unscheduleAllTimers()
void CCScheduler::scheduleSelector(SEL_SCHEDULE pfnSelector, SelectorProtocol *pTarget, float fInterval, bool bPaused) void CCScheduler::scheduleSelector(SEL_SCHEDULE pfnSelector, SelectorProtocol *pTarget, float fInterval, bool bPaused)
{ {
//assert(pfnSelector); assert(pfnSelector);
assert(pTarget); assert(pTarget);
tHashSelectorEntry *pElement = NULL; tHashSelectorEntry *pElement = NULL;