diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-02 11:07:04 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-02 11:07:04 -0400 |
| commit | b1556ef6f9854e08f5bb20907c57a9558005af95 (patch) | |
| tree | c772649ff6b235fbaa8809ff72daf917fce3857f /public/assets/javascripts/rectangles/engine/rooms | |
| parent | 61bb2d3bf1929201f61599ea1dd99f82e521878d (diff) | |
| parent | ddac735a463278e245e566105ace3e32c723128c (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/rectangles/engine/rooms')
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/rooms/_walls.js | 4 | ||||
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/rooms/mover.js | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js index 82ccb87..f0cd558 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js +++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js @@ -46,6 +46,10 @@ } } + base.find = function(id){ + return base.lookup[id] + } + base.assign = function(list){ base.list = list base.lookup = {} diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js index 7195fcc..5c7b4af 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/mover.js +++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js @@ -65,9 +65,7 @@ Rooms.mover = new function(){ // did we actually enter a room? if (intersects.length) { base.room = intersects[0] - base.room.mx_floor.forEach(function(w){ $(w.el).addClass("active") }) - base.room.mx_ceiling.forEach(function(w){ $(w.el).addClass("active") }) - base.room.mx_walls.forEach(function(w){ $(w.el).addClass("active") }) + app.tube("change-room", { room: base.room }) } } |
