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

issue #2404:del a deprecated func

This commit is contained in:
samuele3hu 2013-07-26 15:01:31 +08:00
parent 0f8d10f9a7
commit b6256be1ad
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripting/lua/cocos2dx_support/LuaScriptHandlerMgr.cpp
View File

@ -326,6 +326,7 @@ int tolua_Cocos2d_registerScriptTouchHandler00(lua_State* tolua_S)
touchesMode = Touch::DispatchMode::ONE_BY_ONE; touchesMode = Touch::DispatchMode::ONE_BY_ONE;
self->setTouchMode(touchesMode); self->setTouchMode(touchesMode);
self->setTouchPriority(priority); self->setTouchPriority(priority);
self->setSwallowsTouches(swallowTouches);
ScriptHandlerMgr::getInstance()->addObjectHandler((void*)self, handler, ScriptHandlerMgr::kTouchesHandler); ScriptHandlerMgr::getInstance()->addObjectHandler((void*)self, handler, ScriptHandlerMgr::kTouchesHandler);
} }
return 0; return 0;

11
scripting/lua/script/Deprecated.lua
View File

@ -708,17 +708,6 @@ rawset(SimpleAudioEngine,"sharedEngine",SimpleAudioEngineDeprecated.sharedEngine
--functions of SimpleAudioEngine will be deprecated end --functions of SimpleAudioEngine will be deprecated end
--functions of WebSocket will be deprecated begin
local WebSocketDeprecated = { }
function WebSocketDeprecated.sendBinaryMsg(self,table,size)
deprecatedTip("sendBinaryMsg","sendBinaryStringMsg")
local strMsg = string.char(unpack(table))
return self:sendBinaryStringMsg(strMsg)
end
rawset(WebSocket,"sendBinaryMsg",WebSocketDeprecated.sendBinaryMsg)
--functions of WebSocket will be deprecated end
--functions of CCTMXTiledMap will be deprecated begin --functions of CCTMXTiledMap will be deprecated begin
local CCTMXTiledMapDeprecated = { } local CCTMXTiledMapDeprecated = { }
function CCTMXTiledMapDeprecated.layerNamed(self,layerName) function CCTMXTiledMapDeprecated.layerNamed(self,layerName)