Merge pull request #891 from aivins/issue890

Separate from TilemapLayer after custom callbacks.
phaserjs · Jun 10, 2014 · 1370014 · 1370014
2 parents f433f20 + ccd9146
commit 1370014
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/physics/arcade/World.js b/src/physics/arcade/World.js
@@ -670,13 +670,12 @@ Phaser.Physics.Arcade.prototype = {
         }
 
         for (var i = 0; i < this._mapData.length; i++)
-        {
-            if (this.separateTile(i, sprite.body, this._mapData[i]))
+        {       
+            if (processCallback)
             {
-                //  They collided, is there a custom process callback?
-                if (processCallback)
+                if (processCallback.call(callbackContext, sprite, this._mapData[i]))
                 {
-                    if (processCallback.call(callbackContext, sprite, this._mapData[i]))
+                    if (this.separateTile(i, sprite.body, this._mapData[i]))
                     {
                         this._total++;
 
@@ -686,7 +685,10 @@ Phaser.Physics.Arcade.prototype = {
                         }
                     }
                 }
-                else
+            }
+            else
+            {   
+                if (this.separateTile(i, sprite.body, this._mapData[i]))
                 {
                     this._total++;