Merge pull request #3504 from pandamicro/develop

Fix action recycling issue with lock

Author: pandamicro

cocos2d/actions/CCActionInterval.js

@@ -1083,7 +1083,7 @@ cc.RotateTo = cc.ActionInterval.extend(/** @lends cc.RotateTo# */{
     initWithDuration: function (duration, deltaAngleX, deltaAngleY) {
         if (cc.ActionInterval.prototype.initWithDuration.call(this, duration)) {
             this._dstAngleX = deltaAngleX || 0;
-            this._dstAngleY = deltaAngleY || this._dstAngleX;
+            this._dstAngleY = deltaAngleY !== undefined ? deltaAngleY : this._dstAngleX;
             return true;
         }
         return false;

cocos2d/core/CCActionManager.js

@@ -36,6 +36,7 @@ cc.HashElement = function () {
     this.actionIndex = 0;
     this.currentAction = null; //CCAction
     this.paused = false;
+    this.lock = false;
 };
 
 /**
@@ -84,6 +85,7 @@ cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{
         element.currentAction = null;
         element.paused = false;
         element.target = null;
+        element.lock = false;
         this._elementPool.push(element);
     },
 
@@ -303,7 +305,7 @@ cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{
 
     _deleteHashElement:function (element) {
         var ret = false;
-        if (element) {
+        if (element && !element.lock) {
             if (this._hashTargets[element.target.__instanceId]) {
                 delete this._hashTargets[element.target.__instanceId];
                 var targets = this._arrayTargets;
@@ -329,6 +331,7 @@ cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{
             this._currentTarget = locTargets[elt];
             locCurrTarget = this._currentTarget;
             if (!locCurrTarget.paused && locCurrTarget.actions) {
+                locCurrTarget.lock = true;
                 // The 'actions' CCMutableArray may change while inside this loop.
                 for (locCurrTarget.actionIndex = 0; locCurrTarget.actionIndex < locCurrTarget.actions.length; locCurrTarget.actionIndex++) {
                     locCurrTarget.currentAction = locCurrTarget.actions[locCurrTarget.actionIndex];
@@ -338,16 +341,16 @@ cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{
                     //use for speed
                     locCurrTarget.currentAction.step(dt * ( locCurrTarget.currentAction._speedMethod ? locCurrTarget.currentAction._speed : 1 ) );
 
-                    if (locCurrTarget.currentAction.isDone()) {
+                    if (locCurrTarget.currentAction && locCurrTarget.currentAction.isDone()) {
                         locCurrTarget.currentAction.stop();
                         var action = locCurrTarget.currentAction;
-                        // Make currentAction nil to prevent removeAction from salvaging it.
                         locCurrTarget.currentAction = null;
                         this.removeAction(action);
                     }
 
                     locCurrTarget.currentAction = null;
                 }
+                locCurrTarget.lock = false;
             }
             // only delete currentTarget if no actions were scheduled during the cycle (issue #481)
             if (locCurrTarget.actions.length === 0) {