diff options
| author | ryderr <r@okfoc.us> | 2014-10-01 12:46:47 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-01 12:46:47 -0400 |
| commit | d781e1a412a4f91c150273612ebefba221fa6e5e (patch) | |
| tree | 71629a8f120e2707c5127c091af97ffc8d56efaf /public/assets/javascripts/rectangles/engine/rooms | |
| parent | 9adab52b26614788e99be76311d2cd3506e0595c (diff) | |
| parent | 397738f8ce460fd76c10e5a5e832720804016964 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
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 }) } } |
