diff options
| author | Julie Lala <jules@okfoc.us> | 2014-08-28 20:43:48 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-08-28 20:43:48 -0400 |
| commit | 7998129546e67c0ffcbf63d5132de6333a44b912 (patch) | |
| tree | b1da33d0925cb24b0c3e250cc6326b2e939be6c7 /public/assets/javascripts/rectangles/engine/scenery | |
| parent | a3d40aa3718fce0754d7f78b19de9a00cac15395 (diff) | |
| parent | e35e2f338ee7b14d8396485e58cb5593060add8e (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/rectangles/engine/scenery')
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/scenery/_scenery.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/scenery/undo.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js index 2fd6122..4cf5b06 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] || Rooms.walls[0] + var wall = Walls.list[data.wall_id] || Walls.first() var scene_media = base.add({ data: data, wall: wall, diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js index 54ab755..a7e7d61 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/undo.js +++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js @@ -20,7 +20,7 @@ undo: function(state){ var scenery = Scenery.find(state.id) scenery.deserialize(state) - scenery.set_wall(Rooms.walls[ state.wall_id ]) + scenery.set_wall(Walls.find( state.wall_id )) if (editor.permissions.resize) { Scenery.resize.show(scenery) @@ -32,7 +32,7 @@ redo: function(state){ var scenery = Scenery.find(state.id) scenery.deserialize(state) - scenery.set_wall(Rooms.walls[ state.wall_id ]) + scenery.set_wall(Walls.find( state.wall_id )) if (editor.permissions.resize) { Scenery.resize.show(scenery) |