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

updates CCScheduler to work with the JS Bindings

This commit is contained in:
Rolando Abarca 2012-07-31 15:09:27 -07:00 committed by folecr
parent a97d0f5a95
commit ce40351855
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos2dx/CCScheduler.cpp
View File

@ -161,9 +161,7 @@ void CCTimer::update(float dt)
{ {
(m_pTarget->*m_pfnSelector)(m_fElapsed); (m_pTarget->*m_pfnSelector)(m_fElapsed);
} }
#ifdef COCOS2D_JAVASCRIPT #ifndef COCOS2D_JAVASCRIPT
CCScriptEngineManager::sharedManager()->getScriptEngine()->executeSchedule(m_nScriptHandler, m_fElapsed, (CCNode *)this);
#else
if (m_nScriptHandler) if (m_nScriptHandler)
{ {
CCScriptEngineManager::sharedManager()->getScriptEngine()->executeSchedule(m_nScriptHandler, m_fElapsed); CCScriptEngineManager::sharedManager()->getScriptEngine()->executeSchedule(m_nScriptHandler, m_fElapsed);
@ -183,9 +181,7 @@ void CCTimer::update(float dt)
{ {
(m_pTarget->*m_pfnSelector)(m_fElapsed); (m_pTarget->*m_pfnSelector)(m_fElapsed);
} }
#ifdef COCOS2D_JAVASCRIPT #ifndef COCOS2D_JAVASCRIPT
CCScriptEngineManager::sharedManager()->getScriptEngine()->executeSchedule(m_nScriptHandler, m_fElapsed, (CCNode *)this);
#else
if (m_nScriptHandler) if (m_nScriptHandler)
{ {
CCScriptEngineManager::sharedManager()->getScriptEngine()->executeSchedule(m_nScriptHandler, m_fElapsed); CCScriptEngineManager::sharedManager()->getScriptEngine()->executeSchedule(m_nScriptHandler, m_fElapsed);
@ -204,9 +200,7 @@ void CCTimer::update(float dt)
{ {
(m_pTarget->*m_pfnSelector)(m_fElapsed); (m_pTarget->*m_pfnSelector)(m_fElapsed);
} }
#ifdef COCOS2D_JAVASCRIPT #ifndef COCOS2D_JAVASCRIPT
CCScriptEngineManager::sharedManager()->getScriptEngine()->executeSchedule(m_nScriptHandler, m_fElapsed, (CCNode *)this);
#else
if (m_nScriptHandler) if (m_nScriptHandler)
{ {
CCScriptEngineManager::sharedManager()->getScriptEngine()->executeSchedule(m_nScriptHandler, m_fElapsed); CCScriptEngineManager::sharedManager()->getScriptEngine()->executeSchedule(m_nScriptHandler, m_fElapsed);