Fix #586 actors are no longer killed when added back to the game (#602)

* Fix #586 actors are no longer killed when added back to the game

* Implement suggestions

dist/Excalibur.d.ts

@@ -3206,6 +3206,10 @@ declare module ex {
          * it from the scene graph. It will no longer be drawn or updated.
          */
         kill(): void;
+        /**
+         * If the current actor is killed, it will now not be killed.
+         */
+        unkill(): void;
         /**
          * Indicates wether the actor has been killed.
          */

dist/Excalibur.js

@@ -1,4 +1,4 @@
-/*! excalibur - v0.6.0 - 2016-05-16
+/*! excalibur - v0.6.0 - 2016-05-25
 * https://github.com/excaliburjs/Excalibur
 * Copyright (c) 2016 Excalibur.js <https://github.com/excaliburjs/Excalibur/graphs/contributors>; Licensed BSD-2-Clause*/
 if (typeof window === 'undefined') {
@@ -5650,6 +5650,9 @@ var ex;
             return this.children.indexOf(actor) > -1;
         };
         Scene.prototype.add = function (entity) {
+            if (entity instanceof ex.Actor) {
+                entity.unkill();
+            }
             if (entity instanceof ex.UIActor) {
                 if (!ex.Util.contains(this.uiActors, entity)) {
                     this.addUIActor(entity);
@@ -6386,6 +6389,12 @@ var ex;
                 this.logger.warn('Cannot kill actor, it was never added to the Scene');
             }
         };
+        /**
+         * If the current actor is killed, it will now not be killed.
+         */
+        Actor.prototype.unkill = function () {
+            this._isKilled = false;
+        };
         /**
          * Indicates wether the actor has been killed.
          */

dist/excalibur-0.6.0.d.ts

@@ -3206,6 +3206,10 @@ declare module ex {
          * it from the scene graph. It will no longer be drawn or updated.
          */
         kill(): void;
+        /**
+         * If the current actor is killed, it will now not be killed.
+         */
+        unkill(): void;
         /**
          * Indicates wether the actor has been killed.
          */

dist/excalibur-0.6.0.js

@@ -1,4 +1,4 @@
-/*! excalibur - v0.6.0 - 2016-05-16
+/*! excalibur - v0.6.0 - 2016-05-25
 * https://github.com/excaliburjs/Excalibur
 * Copyright (c) 2016 Excalibur.js <https://github.com/excaliburjs/Excalibur/graphs/contributors>; Licensed BSD-2-Clause*/
 if (typeof window === 'undefined') {
@@ -5650,6 +5650,9 @@ var ex;
             return this.children.indexOf(actor) > -1;
         };
         Scene.prototype.add = function (entity) {
+            if (entity instanceof ex.Actor) {
+                entity.unkill();
+            }
             if (entity instanceof ex.UIActor) {
                 if (!ex.Util.contains(this.uiActors, entity)) {
                     this.addUIActor(entity);
@@ -6386,6 +6389,12 @@ var ex;
                 this.logger.warn('Cannot kill actor, it was never added to the Scene');
             }
         };
+        /**
+         * If the current actor is killed, it will now not be killed.
+         */
+        Actor.prototype.unkill = function () {
+            this._isKilled = false;
+        };
         /**
          * Indicates wether the actor has been killed.
          */

sandbox/web/Excalibur.js

@@ -1,4 +1,4 @@
-/*! excalibur - v0.6.0 - 2016-05-16
+/*! excalibur - v0.6.0 - 2016-05-25
 * https://github.com/excaliburjs/Excalibur
 * Copyright (c) 2016 Excalibur.js <https://github.com/excaliburjs/Excalibur/graphs/contributors>; Licensed BSD-2-Clause*/
 if (typeof window === 'undefined') {
@@ -5650,6 +5650,9 @@ var ex;
             return this.children.indexOf(actor) > -1;
         };
         Scene.prototype.add = function (entity) {
+            if (entity instanceof ex.Actor) {
+                entity.unkill();
+            }
             if (entity instanceof ex.UIActor) {
                 if (!ex.Util.contains(this.uiActors, entity)) {
                     this.addUIActor(entity);
@@ -6386,6 +6389,12 @@ var ex;
                 this.logger.warn('Cannot kill actor, it was never added to the Scene');
             }
         };
+        /**
+         * If the current actor is killed, it will now not be killed.
+         */
+        Actor.prototype.unkill = function () {
+            this._isKilled = false;
+        };
         /**
          * Indicates wether the actor has been killed.
          */

src/engine/Actor.ts

@@ -518,6 +518,14 @@ module ex {
           this.logger.warn('Cannot kill actor, it was never added to the Scene');
        }
     }
+
+    /**
+     * If the current actor is killed, it will now not be killed. 
+     */
+    public unkill() {
+       this._isKilled = false;
+    }
+
     /**
      * Indicates wether the actor has been killed.
      */

src/engine/Scene.ts

@@ -378,6 +378,9 @@ module ex {
        */
       public add(uiActor: UIActor): void;
       public add(entity: any): void {
+         if(entity instanceof Actor) {
+            (<Actor>entity).unkill();
+         }
          if (entity instanceof UIActor) {
             if (!Util.contains(this.uiActors, entity)) {
                this.addUIActor(entity);

src/spec/ActorSpec.ts

@@ -951,4 +951,15 @@ describe('A game actor', () => {
       expect(killed).toBe(true);
    });
 
+   it('is no longer killed when re-added to the game', () => {
+      var actor = new ex.Actor();
+      scene.add(actor);
+      expect(actor.isKilled()).toBeFalsy();
+      actor.kill();
+      scene.update(engine, 100);
+      expect(actor.isKilled()).toBeTruthy();
+      scene.add(actor);
+      expect(actor.isKilled()).toBeFalsy();
+   });
+
 });