diff --git a/cocos2dx/CCScheduler.cpp b/cocos2dx/CCScheduler.cpp index fb1ab3e193..0915c2e106 100644 --- a/cocos2dx/CCScheduler.cpp +++ b/cocos2dx/CCScheduler.cpp @@ -794,7 +794,7 @@ void CCScheduler::update(float dt) { if (pEngine != NULL && kScriptTypeJavascript == pEngine->getScriptType()) { - pEngine->executeSchedule(NULL, dt, (CCNode *)pEntry->target); + pEngine->executeSchedule(0, dt, (CCNode *)pEntry->target); } pEntry->target->update(dt); @@ -808,7 +808,7 @@ void CCScheduler::update(float dt) { if (pEngine != NULL && kScriptTypeJavascript == pEngine->getScriptType()) { - pEngine->executeSchedule(NULL, dt, (CCNode *)pEntry->target); + pEngine->executeSchedule(0, dt, (CCNode *)pEntry->target); } pEntry->target->update(dt); @@ -822,7 +822,7 @@ void CCScheduler::update(float dt) { if (pEngine != NULL && kScriptTypeJavascript == pEngine->getScriptType()) { - pEngine->executeSchedule(NULL, dt, (CCNode *)pEntry->target); + pEngine->executeSchedule(0, dt, (CCNode *)pEntry->target); } pEntry->target->update(dt); diff --git a/cocos2dx/platform/android/CCPlatformDefine.h b/cocos2dx/platform/android/CCPlatformDefine.h index 9abfc5099d..0ebdb1e5a5 100644 --- a/cocos2dx/platform/android/CCPlatformDefine.h +++ b/cocos2dx/platform/android/CCPlatformDefine.h @@ -8,7 +8,7 @@ if (! (cond)) \ { \ char content[256]; \ sprintf(content, "%s function:%s line:%d", __FILE__, __FUNCTION__, __LINE__); \ - CCMessageBox(content, "Assert error"); \ + cocos2d::CCMessageBox(content, "Assert error"); \ }