From 4ef340497ef24bb2ecacb2c9c4106c24515c874f Mon Sep 17 00:00:00 2001 From: Julie Lala Date: Fri, 22 Aug 2014 17:33:32 -0400 Subject: null fix --- public/assets/javascripts/rectangles/engine/scenery/_scenery.js | 2 +- public/assets/javascripts/rectangles/engine/scenery/types/_object.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'public/assets/javascripts/rectangles/engine') diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js index 1e2e83a..2fd6122 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js +++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js @@ -84,7 +84,7 @@ var Scenery = new function(){ base.deserialize = function(scenery_data){ scenery_data.forEach(function(data){ - var wall = Rooms.walls[data.wall_id] + var wall = Rooms.walls[data.wall_id] || Rooms.walls[0] var scene_media = base.add({ data: data, wall: wall, diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js index effee2a..2dbae48 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js +++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js @@ -16,6 +16,7 @@ Scenery.types.base = Fiber.extend(function(base){ set_wall: function(opt){ this.wall = opt.wall || this.wall + if (! this.wall) return this.bounds = this.wall.surface.bounds_at_index_with_dimensions(opt.index || 0, this.dimensions) }, -- cgit v1.2.3-70-g09d2