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

Cleaned up CCAction.cpp 

*Fixed tab/space issue.
*Removed unneeded if/else block.
*Added explicit braces around if block.
This commit is contained in:
Justin Fraize 2015-02-12 21:00:12 -08:00
parent 87e444873f
commit 3667cc6e1f
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cocos/2d/CCAction.cpp
View File

@ -201,16 +201,8 @@ bool Follow::initWithTarget(Node *followedNode, const Rect& rect/* = Rect::ZERO*
followedNode->retain(); followedNode->retain();
_followedNode = followedNode; _followedNode = followedNode;
_worldRect = rect; _worldRect = rect;
if (rect.equals(Rect::ZERO)) _boundarySet = !rect.equals(Rect::ZERO);
{
_boundarySet = false;
}
else
{
_boundarySet = true;
}
_boundaryFullyCovered = false; _boundaryFullyCovered = false;
Size winSize = Director::getInstance()->getWinSize(); Size winSize = Director::getInstance()->getWinSize();
@ -254,7 +246,9 @@ void Follow::step(float dt)
{ {
// whole map fits inside a single screen, no need to modify the position - unless map boundaries are increased // whole map fits inside a single screen, no need to modify the position - unless map boundaries are increased
if(_boundaryFullyCovered) if(_boundaryFullyCovered)
{
return; return;
}
Vec2 tempPos = _halfScreenSize - _followedNode->getPosition(); Vec2 tempPos = _halfScreenSize - _followedNode->getPosition();