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

Merge pull request #7170 from samuele3hu/v3SequenceCreate 

Fix the error that lua binding for create function of Sequence would lead to endless loop
This commit is contained in:
minggo 2014-06-23 16:44:05 +08:00
parent c579fbf845 0d7c453878
commit 87dd434045
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp
View File

@ -1756,19 +1756,19 @@ int tolua_cocos2d_Sequence_create(lua_State* tolua_S)
goto tolua_lerror;
#endif
cocos2d::FiniteTimeAction* item = static_cast<cocos2d::FiniteTimeAction*>(tolua_tousertype(tolua_S, 1 + i, NULL));
if (NULL != item)
cocos2d::FiniteTimeAction* item = static_cast<cocos2d::FiniteTimeAction*>(tolua_tousertype(tolua_S, 1 + i, nullptr));
if (nullptr != item)
{
array.pushBack(item);
++i;
}
++i;
}
}
cocos2d::Sequence* tolua_ret = cocos2d::Sequence::create(array);
//issue 2433 uncheck
int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
int* pLuaID = (tolua_ret) ? &tolua_ret->_luaID : NULL;
int* pLuaID = (tolua_ret) ? &tolua_ret->_luaID : nullptr;
toluafix_pushusertype_ccobject(tolua_S, nID, pLuaID, (void*)tolua_ret,"cc.Sequence");
return 1;
}