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

Merge pull request #1813 from dumganhar/gles20 

Fixed a compilation error for android.
This commit is contained in:
James Chen 2013-01-03 04:00:54 -08:00
parent 94e779ae63 b50bf716a2
commit 90960cce57
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos2dx/CCScheduler.cpp
View File

@ -794,7 +794,7 @@ void CCScheduler::update(float dt)
{ {
if (pEngine != NULL && kScriptTypeJavascript == pEngine->getScriptType()) if (pEngine != NULL && kScriptTypeJavascript == pEngine->getScriptType())
{ {
pEngine->executeSchedule(NULL, dt, (CCNode *)pEntry->target); pEngine->executeSchedule(0, dt, (CCNode *)pEntry->target);
} }
pEntry->target->update(dt); pEntry->target->update(dt);
@ -808,7 +808,7 @@ void CCScheduler::update(float dt)
{ {
if (pEngine != NULL && kScriptTypeJavascript == pEngine->getScriptType()) if (pEngine != NULL && kScriptTypeJavascript == pEngine->getScriptType())
{ {
pEngine->executeSchedule(NULL, dt, (CCNode *)pEntry->target); pEngine->executeSchedule(0, dt, (CCNode *)pEntry->target);
} }
pEntry->target->update(dt); pEntry->target->update(dt);
@ -822,7 +822,7 @@ void CCScheduler::update(float dt)
{ {
if (pEngine != NULL && kScriptTypeJavascript == pEngine->getScriptType()) if (pEngine != NULL && kScriptTypeJavascript == pEngine->getScriptType())
{ {
pEngine->executeSchedule(NULL, dt, (CCNode *)pEntry->target); pEngine->executeSchedule(0, dt, (CCNode *)pEntry->target);
} }
pEntry->target->update(dt); pEntry->target->update(dt);

2
cocos2dx/platform/android/CCPlatformDefine.h
View File

@ -8,7 +8,7 @@ if (! (cond)) \
{ \ { \
char content[256]; \ char content[256]; \
sprintf(content, "%s function:%s line:%d", __FILE__, __FUNCTION__, __LINE__); \ sprintf(content, "%s function:%s line:%d", __FILE__, __FUNCTION__, __LINE__); \
CCMessageBox(content, "Assert error"); \ cocos2d::CCMessageBox(content, "Assert error"); \
} }