From 68f71b3df48d00c5566c837bd710fcd06151a2dc Mon Sep 17 00:00:00 2001 From: dualface Date: Fri, 10 Oct 2014 23:59:41 +0800 Subject: [PATCH] do not load deprecated Lua API from luabinding of modules --- cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp | 3 --- .../manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp | 2 -- .../cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp | 3 --- .../manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp | 3 --- .../manual/extension/lua_cocos2dx_extension_manual.cpp | 4 ---- .../manual/network/lua_cocos2dx_network_manual.cpp | 4 ---- .../lua-bindings/manual/ui/lua_cocos2dx_ui_manual.cpp | 2 -- 7 files changed, 21 deletions(-) diff --git a/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp b/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp index 0cc0d2ba61..6a114d5b40 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp +++ b/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp @@ -57,9 +57,6 @@ bool LuaEngine::init(void) { _stack = LuaStack::create(); _stack->retain(); - executeScriptFile("DeprecatedCocos2dClass"); - executeScriptFile("DeprecatedCocos2dEnum"); - executeScriptFile("DeprecatedCocos2dFunc"); return true; } diff --git a/cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp b/cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp index 11693b86cb..2af71ea569 100644 --- a/cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp @@ -465,7 +465,5 @@ int register_cocosbuilder_module(lua_State* tolua_S) register_all_cocos2dx_cocosbuilder_manual(tolua_S); } lua_pop(tolua_S, 1); - - LuaEngine::getInstance()->executeScriptFile("DeprecatedCocosBuilderClass"); return 1; } diff --git a/cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp b/cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp index 9098fd949c..6560cf719b 100644 --- a/cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp @@ -33,8 +33,5 @@ int register_cocosdenshion_module(lua_State* L) register_all_cocos2dx_cocosdenshion(L); } lua_pop(L, 1); - - cocos2d::LuaEngine::getInstance()->executeScriptFile("DeprecatedCocosDenshionClass"); - cocos2d::LuaEngine::getInstance()->executeScriptFile("DeprecatedCocosDenshionFunc"); return 1; } \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp b/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp index eabfb21ac0..1fe69a01dc 100644 --- a/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp @@ -647,8 +647,5 @@ int register_cocostudio_module(lua_State* L) lua_register_cocos2dx_coco_studio_CustomGUIReader(L); } lua_pop(L, 1); - - LuaEngine::getInstance()->executeScriptFile("DeprecatedCocoStudioClass"); - LuaEngine::getInstance()->executeScriptFile("DeprecatedCocoStudioFunc"); return 1; } diff --git a/cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.cpp b/cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.cpp index 48a3eda657..5ae4cf3c9a 100644 --- a/cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.cpp @@ -957,9 +957,5 @@ int register_extension_module(lua_State* tolua_S) register_all_cocos2dx_extension_manual(tolua_S); } lua_pop(tolua_S, 1); - - LuaEngine::getInstance()->executeScriptFile("DeprecatedExtensionClass"); - LuaEngine::getInstance()->executeScriptFile("DeprecatedExtensionEnum"); - LuaEngine::getInstance()->executeScriptFile("DeprecatedExtensionFunc"); return 1; } diff --git a/cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp b/cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp index d563fdf546..8a79fefe0b 100644 --- a/cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp @@ -53,9 +53,5 @@ int register_network_module(lua_State* L) } lua_pop(L, 1); - cocos2d::LuaEngine::getInstance()->executeScriptFile("DeprecatedNetworkClass"); - cocos2d::LuaEngine::getInstance()->executeScriptFile("DeprecatedNetworkEnum"); - cocos2d::LuaEngine::getInstance()->executeScriptFile("DeprecatedNetworkFunc"); - return 1; } diff --git a/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.cpp b/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.cpp index 4318a9173f..c00db6339c 100644 --- a/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.cpp @@ -808,7 +808,5 @@ int register_ui_moudle(lua_State* L) } lua_pop(L, 1); - LuaEngine::getInstance()->executeScriptFile("DeprecatedUIEnum"); - LuaEngine::getInstance()->executeScriptFile("DeprecatedUIFunc"); return 1; }