Fix crash when resetting play screen while using rope.

blipjoy · Dec 22, 2013 · 7d8a3c3 · 7d8a3c3
1 parent 1881aab
commit 7d8a3c3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/public/js/objects/rope.js b/public/js/objects/rope.js
@@ -184,17 +184,20 @@ game.Rope = me.Renderable.extend({
     },
 
     "removeParts" : function () {
-        var exploding = this.exploding;
-        this.parts.forEach(function (part) {
-            if (exploding) {
-                setTimeout(function () {
-                    part.explode();
-                }, Math.random() * 125);
-            }
-            else {
-                me.game.world.removeChild(part);
-            }
-        });
+        if (!game.playscreen.resetting) {
+            var exploding = this.exploding;
+            this.parts.forEach(function (part) {
+                if (exploding) {
+                    setTimeout(function () {
+                        part.explode();
+                    }, Math.random() * 125);
+                }
+                else {
+                    me.game.world.removeChild(part);
+                }
+            });
+        }
+        this.parts = [];
     },
 
     "adjust" : function () {

diff --git a/public/js/screens/play.js b/public/js/screens/play.js
@@ -31,6 +31,8 @@ game.Overlay = me.ImageLayer.extend({
 
 game.PlayScreen = me.ScreenObject.extend({
     "onResetEvent" : function () {
+        game.playscreen.resetting = false;
+
         // Music
         if (!me.audio.getCurrentTrack()) {
             me.audio.playTrack("city");
@@ -128,7 +130,7 @@ game.PlayScreen = me.ScreenObject.extend({
     },
 
     "mousedown" : function (e) {
-        if (me.state.isPaused()) {
+        if (me.state.isPaused() || game.playscreen.resetting) {
             return;
         }
 
@@ -174,11 +176,13 @@ game.PlayScreen = me.ScreenObject.extend({
     },
 
     "end" : function () {
+        game.playscreen.resetting = true;
         new me.Tween(this.overlay)
             .to({
                 "alpha" : 1
             }, 500)
             .onComplete(function () {
+                delete game.playscreen.rope;
                 me.state.change.defer(me.state.PLAY);
             }).start();
     }