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

Merge pull request #7942 from andyque/deleteRedundantCode 

remove dead code
This commit is contained in:
minggo 2014-09-04 13:45:12 +08:00
parent 0021b39e37 a1edd4a819
commit 659ba68199
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cocos/editor-support/cocostudio/CCActionNode.cpp
View File

@ -314,17 +314,13 @@ void ActionNode::initWithDictionary(const rapidjson::Value& dic, Ref* root)
void ActionNode::initActionNodeFromRoot(Ref* root) void ActionNode::initActionNodeFromRoot(Ref* root)
{ {
Node* rootNode = dynamic_cast<Node*>(root); Widget* rootWidget = dynamic_cast<Widget*>(root);
if (rootNode != nullptr) if (rootWidget != nullptr)
{ {
Widget* rootWidget = dynamic_cast<Widget*>(root); Widget* widget = Helper::seekActionWidgetByActionTag(rootWidget, getActionTag());
if (rootWidget != nullptr) if (widget != nullptr)
{ {
Widget* widget = Helper::seekActionWidgetByActionTag(rootWidget, getActionTag()); setObject(widget);
if (widget != nullptr)
{
setObject(widget);
}
} }
} }
} }
@ -367,14 +363,6 @@ Node* ActionNode::getActionNode()
{ {
return cNode; return cNode;
} }
else
{
Widget* rootWidget = dynamic_cast<Widget*>(_object);
if (rootWidget != nullptr)
{
return rootWidget;
}
}
return nullptr; return nullptr;
} }