From 6eeb1be85301468a87f2d1200fe0ecbed54c89db Mon Sep 17 00:00:00 2001 From: Andrew Kesterson Date: Thu, 12 Jun 2014 22:09:23 -0700 Subject: [PATCH] Reworking the junkmap --- moonlight/js/moonlight-skulk.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/moonlight/js/moonlight-skulk.js b/moonlight/js/moonlight-skulk.js index 805a49e..12d9347 100644 --- a/moonlight/js/moonlight-skulk.js +++ b/moonlight/js/moonlight-skulk.js @@ -772,20 +772,20 @@ GameState.prototype.preload = function() var s = moonlightSettings['spritesheets'][k] game.load.spritesheet(s['name'], s['path'], s['width'], s['height'], s['frames']) } + this.load.tilemap('map', moonlightSettings['map']['path'], null, Phaser.Tilemap.TILED_JSON); + for (var k in moonlightSettings['map']['tilesets']) { + var ts = moonlightSettings['map']['tilesets'][k]; + map.addTilesetImage(ts['name']); + } } GameState.prototype.create = function() { map = this.add.tilemap('map'); - for (var k in moonlightSettings['map']['tilesets']) { - var ts = moonlightSettings['map']['tilesets'][k]; - map.addTilesetImage(ts['name']); - } - this.map_collision_layers = []; for (var ln in moonlightSettings['map']['layers']) {