merge

1 files changed, 6 insertions, 1 deletions

diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js
index 26bf055..1abe2ba 100644
--- a/public/assets/javascripts/rectangles/models/room.js
+++ b/public/assets/javascripts/rectangles/models/room.js
@@ -31,10 +31,14 @@
 	var Room = function(opt){
 		this.id = opt.id || Rooms.uid("room_")
 		this.rect = opt.rect
-		this.regions = []
+		this.regions = opt.regions || []
 
 		this.height = opt.height || 200
 		this.focused = false
+
+		this.mx_walls = []
+		this.mx_floor = []
+		this.mx_ceiling = []
 	}
 	
 	Room.prototype.copy = function(){
@@ -125,6 +129,7 @@
 	Room.prototype.collidesDisc = function(src, dest, radius){
 	  var x = dest.x, y = dest.z
 		var collision = 0, wall_collision, contains_x, contains_y
+
 		this.regions.forEach(function(r){
 			if (! r.sides) return