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

issue #2433:Modify cocos2d.ini

This commit is contained in:
samuele3hu 2013-08-15 16:14:14 +08:00
parent f29525bbc6
commit 2d5482a0ab
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp.REMOVED.git-id
View File

@ -1 +1 @@
fe22a58a97c6532a0d8b5c326cd683e108407b1e
8115474f6f2838b3226e1075c612086088005bbd

2
scripting/lua/cocos2dx_support/generated/lua_cocos2dx_extension_auto.cpp.REMOVED.git-id
View File

@ -1 +1 @@
55f9aed3fc28a46be61e0ddaa629a9503b54a1ac
9febc607103481a54085d37c4779c1d04bcf457c

8
scripting/lua/cocos2dx_support/generated/lua_cocos2dx_manual.cpp
View File

@ -1314,9 +1314,9 @@ tolua_lerror:
// setBlendFunc
template<class T>
static int tolua_cocos2dx_setBlendFunc(lua_State* tolua_S)
static int tolua_cocos2dx_setBlendFunc(lua_State* tolua_S,const char* className)
{
if (NULL == tolua_S)
if (NULL == tolua_S || NULL == className || strlen(className) == 0)
return 0;
int argc = 0;
@ -1324,7 +1324,7 @@ static int tolua_cocos2dx_setBlendFunc(lua_State* tolua_S)
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
// if (!tolua_isusertype(tolua_S,1,typeid(T).name(),0,&tolua_err)) goto tolua_lerror;
if (!tolua_isusertype(tolua_S,1,className,0,&tolua_err)) goto tolua_lerror;
#endif
self = static_cast<T*>(tolua_tousertype(tolua_S,1,0));
@ -1357,7 +1357,7 @@ tolua_lerror:
static int tolua_cocos2dx_Sprite_setBlendFunc(lua_State* tolua_S)
{
return tolua_cocos2dx_setBlendFunc<Sprite>(tolua_S);
return tolua_cocos2dx_setBlendFunc<Sprite>(tolua_S,"Sprite");
}

2
tools/tolua/cocos2dx.ini
View File

@ -132,7 +132,7 @@ rename_classes = ParticleSystemQuad::ParticleSystem,
remove_prefix =
# classes for which there will be no "parent" lookup
classes_have_no_parents = Node Director SimpleAudioEngine FileUtils TMXMapInfo Application
classes_have_no_parents = Director SimpleAudioEngine FileUtils TMXMapInfo Application
# base classes which will be skipped when their sub-classes found them.
base_classes_to_skip = Clonable