From 2d5482a0ab38b7f8cc46ac6221b7b04e7cb47149 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Thu, 15 Aug 2013 16:14:14 +0800 Subject: [PATCH] issue #2433:Modify cocos2d.ini --- .../generated/lua_cocos2dx_auto.cpp.REMOVED.git-id | 2 +- .../lua_cocos2dx_extension_auto.cpp.REMOVED.git-id | 2 +- .../cocos2dx_support/generated/lua_cocos2dx_manual.cpp | 8 ++++---- tools/tolua/cocos2dx.ini | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp.REMOVED.git-id b/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp.REMOVED.git-id index 9b5885cf90..452cf41355 100644 --- a/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp.REMOVED.git-id +++ b/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp.REMOVED.git-id @@ -1 +1 @@ -fe22a58a97c6532a0d8b5c326cd683e108407b1e \ No newline at end of file +8115474f6f2838b3226e1075c612086088005bbd \ No newline at end of file diff --git a/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_extension_auto.cpp.REMOVED.git-id b/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_extension_auto.cpp.REMOVED.git-id index 5d9c096a15..170076ab1a 100644 --- a/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_extension_auto.cpp.REMOVED.git-id +++ b/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_extension_auto.cpp.REMOVED.git-id @@ -1 +1 @@ -55f9aed3fc28a46be61e0ddaa629a9503b54a1ac \ No newline at end of file +9febc607103481a54085d37c4779c1d04bcf457c \ No newline at end of file diff --git a/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_manual.cpp b/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_manual.cpp index 0453bdb773..a56053b9d1 100644 --- a/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_manual.cpp +++ b/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_manual.cpp @@ -1314,9 +1314,9 @@ tolua_lerror: // setBlendFunc template -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(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(tolua_S); + return tolua_cocos2dx_setBlendFunc(tolua_S,"Sprite"); } diff --git a/tools/tolua/cocos2dx.ini b/tools/tolua/cocos2dx.ini index 1582f8ed0e..2200bd45c0 100644 --- a/tools/tolua/cocos2dx.ini +++ b/tools/tolua/cocos2dx.ini @@ -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