Permalink
Browse files

Merge pull request #584 from dingpinglv/iss1509_UpdateMenuTest

fixed #1509 correct bug of cc.Follow
  • Loading branch information...
linshun committed Oct 17, 2012
2 parents 3e05fc5 + b4c2c36 commit 9e01015ddb826466b83d0d4963be19f9933f6897
Showing with 3 additions and 2 deletions.
  1. +1 −1 cocos2d/actions/CCAction.js
  2. +2 −1 cocos2d/label_nodes/CCLabelAtlas.js
@@ -367,7 +367,7 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{
rect = rect || cc.RectZero();
this._followedNode = followedNode;
- this._boundarySet = cc.Rect.CCRectEqualToRect(rect, cc.RectZero());
+ this._boundarySet = !cc.Rect.CCRectEqualToRect(rect, cc.RectZero());
this._boundaryFullyCovered = false;
@@ -54,7 +54,8 @@ cc.LabelAtlas = cc.AtlasNode.extend(/** @lends cc.LabelAtlas# */{
textureFilename = arg[1];
width = arg[2];
height = arg[3];
- startChar = String.fromCharCode(arg[4]);
+ //startChar = String.fromCharCode(arg[4]);
+ startChar = arg[4];
cc.Assert(label !== null, "Label must be non-nil");
}

0 comments on commit 9e01015

Please sign in to comment.