CSV Tilemap tiles would incorrectly set the Tile layer reference, causing collision to fail (thanks @Chapelin, fix phaserjs#692)

Author: photonstorm

README.md

@@ -154,14 +154,14 @@ Version 2.0.4 - "Mos Shirare" - in development
 * P2.Body.loadPolygon has been updated to correct center of mass issues (thanks @georgiee, fix #749)
 * Game checks if window.console exists before using it (should fix IE9 issues when dev tools are closed), however it is still used deeper in Pixi.
 * Masks now work when used in RenderTextures / CacheAsBitmap and Filters (pixi.js update)
-* Fixed bug where stroked text sometimes got clipped (pixi.js update)
-* Fixed Polygon.contains for coordinates to the left of the polygon (thanks @vilcans, fix #766)
-* Fixed issue where game pause/resume could incorrectly increment paused Timers (thanks @georgiee, fix #759)
-* Fixed issue where Animations resuming from a pause would skip frames (thanks @merixstudio, fix #730)
+* Stroked text sometimes got clipped (pixi.js update)
+* Polygon.contains now works for coordinates to the left of the polygon (thanks @vilcans, fix #766)
+* Game pause/resume could incorrectly increment paused Timers (thanks @georgiee, fix #759)
+* Animations resuming from a pause no longer skip frames (thanks @merixstudio, fix #730)
 * Tilemap.fill would throw an error if called on a blank tilemap full of null values (thanks @DrHackenstein, fix #761)
 * LoaderParser.bitmapFont updated so xml parsing works properly on IE9 (thanks @georgiee)
-* Fixed an issue where Sounds that had been paused via game code would un-mute if the game paused and resumed.
-* Fixed Timer issue where pausing then restarting could add to the duration of running manual timers (fix #759)
+* Sounds that had been paused via game code would un-mute if the game paused and resumed.
+* CSV Tilemap tiles would incorrectly set the Tile layer reference, causing collision to fail (thanks @Chapelin, fix #692)
 
 
 ### ToDo

src/tilemap/Tilemap.js

@@ -66,6 +66,11 @@ Phaser.Tilemap = function (game, key, tileWidth, tileHeight, width, height) {
     */
     this.orientation = data.orientation;
 
+    /**
+    * @property {number} format - The format of the map data, either Phaser.Tilemap.CSV or Phaser.Tilemap.TILED_JSON.
+    */
+    this.format = data.format;
+
     /**
     * @property {number} version - The version of the map data (as specified in Tiled, usually 1).
     */
@@ -263,7 +268,7 @@ Phaser.Tilemap.prototype = {
         {
             tileset = this.getTilesetIndex(tileset);
 
-            if (tileset === null)
+            if (tileset === null && this.format === Phaser.Tilemap.TILED_JSON)
             {
                 console.warn('Phaser.Tilemap.addTilesetImage: No data found in the JSON matching the tileset name: "' + key + '"');
                 return null;

src/tilemap/TilemapParser.js

@@ -89,7 +89,7 @@ Phaser.TilemapParser = {
 
             for (var x = 0; x < column.length; x++)
             {
-                output[y][x] = new Phaser.Tile(0, parseInt(column[x], 10), x, y, tileWidth, tileHeight);
+                output[y][x] = new Phaser.Tile(map.layers[0], parseInt(column[x], 10), x, y, tileWidth, tileHeight);
             }
 
             if (width === 0)
@@ -98,6 +98,7 @@ Phaser.TilemapParser = {
             }
         }
 
+        map.format = Phaser.Tilemap.CSV;
         map.name = key;
         map.width = width;
         map.height = height;
@@ -118,6 +119,7 @@ Phaser.TilemapParser = {
 
     /**
     * Returns an empty map data object.
+    *
     * @method Phaser.TilemapParser.getEmptyData
     * @return {object} Generated map data.
     */
@@ -198,6 +200,7 @@ Phaser.TilemapParser = {
         map.tileWidth = json.tilewidth;
         map.tileHeight = json.tileheight;
         map.orientation = json.orientation;
+        map.format = Phaser.Tilemap.TILED_JSON;
         map.version = json.version;
         map.properties = json.properties;
         map.widthInPixels = map.width * map.tileWidth;
@@ -242,7 +245,7 @@ Phaser.TilemapParser = {
 
             //  Loop through the data field in the JSON.
 
-            //  This is an array containing the tile indexes, one after the other. null = no tile, everything else = the tile index (starting at 1 for Tiled, 0 for CSV)
+            //  This is an array containing the tile indexes, one after the other. -1 = no tile, everything else = the tile index (starting at 1 for Tiled, 0 for CSV)
             //  If the map contains multiple tilesets then the indexes are relative to that which the set starts from.
             //  Need to set which tileset in the cache = which tileset in the JSON, if you do this manually it means you can use the same map data but a new tileset.
 
@@ -255,7 +258,7 @@ Phaser.TilemapParser = {
                 }
                 else
                 {
-                    row.push(null);
+                    row.push(new Phaser.Tile(layer, -1, x, output.length, json.tilewidth, json.tileheight));
                 }
 
                 x++;