From 4dbc5997f094a9333c021032174833e0a2a5caee Mon Sep 17 00:00:00 2001 From: YuLei Liao Date: Thu, 2 Feb 2012 22:15:34 +0800 Subject: [PATCH] * update tolua++ packages --- lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id | 2 +- lua/cocos2dx_support/tolua_fix.c | 2 +- tools/tolua++/CCMenu.pkg | 1 + tools/tolua++/CCMutableArray.pkg | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id b/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id index 45ad3d67f7..c878efe50b 100644 --- a/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id +++ b/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id @@ -1 +1 @@ -504dc00d2269a2225a4ea794b9aa52df7c1489aa \ No newline at end of file +ec9653c088757bb11c48b51be00863d103543e35 \ No newline at end of file diff --git a/lua/cocos2dx_support/tolua_fix.c b/lua/cocos2dx_support/tolua_fix.c index 913d046ea4..2884b947a1 100644 --- a/lua/cocos2dx_support/tolua_fix.c +++ b/lua/cocos2dx_support/tolua_fix.c @@ -70,7 +70,7 @@ TOLUA_API int tolua_remove_ccobject_by_refid(lua_State* L, int refid) { lua_pop(L, 1); // Lua stack has closed, C++ object not in Lua. - printf("[LUA ERROR] remove CCObject with NULL ptr, refid: %d\n", refid); + // printf("[LUA ERROR] remove CCObject with NULL ptr, refid: %d\n", refid); return -2; } diff --git a/tools/tolua++/CCMenu.pkg b/tools/tolua++/CCMenu.pkg index bfb9456206..392b45db70 100644 --- a/tools/tolua++/CCMenu.pkg +++ b/tools/tolua++/CCMenu.pkg @@ -21,4 +21,5 @@ class CCMenu : public CCLayer ccColor3B getColor(void); static CCMenu* node(); + static CCMenu* menuWithItem(CCMenuItem* item); }; diff --git a/tools/tolua++/CCMutableArray.pkg b/tools/tolua++/CCMutableArray.pkg index 28d09848bf..adb39d4c06 100644 --- a/tools/tolua++/CCMutableArray.pkg +++ b/tools/tolua++/CCMutableArray.pkg @@ -3,6 +3,8 @@ class CCMutableArray : public CCObject { TOLUA_TEMPLATE_BIND(T, CCObject*, CCSpriteFrame*, CCFiniteTimeAction*) + CCMutableArray(unsigned int uSize = 0); + unsigned int count(void); unsigned int getIndexOfObject(T pObject);