From 6afcacbc33836df6091f5a271ff90eff495566ae Mon Sep 17 00:00:00 2001 From: dingpinglv Date: Wed, 17 Oct 2012 14:48:49 +0800 Subject: [PATCH] fixed #1509 correct bug of cc.Follow --- cocos2d/actions/CCAction.js | 2 +- cocos2d/label_nodes/CCLabelAtlas.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cocos2d/actions/CCAction.js b/cocos2d/actions/CCAction.js index 96c5ea976a..818737a456 100644 --- a/cocos2d/actions/CCAction.js +++ b/cocos2d/actions/CCAction.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; diff --git a/cocos2d/label_nodes/CCLabelAtlas.js b/cocos2d/label_nodes/CCLabelAtlas.js index ef25cad437..daedfe86b4 100644 --- a/cocos2d/label_nodes/CCLabelAtlas.js +++ b/cocos2d/label_nodes/CCLabelAtlas.js @@ -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"); }