1 files changed, 9 insertions, 18 deletions
diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js
index 0f09325..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(){
@@ -122,8 +126,10 @@
 		return collision
 	}
 
-	Room.prototype.collidesDisc = function(x,y,radius){
+	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
 			
@@ -152,25 +158,10 @@
 			if (contains_y) {
 				collision |= wall_collision & LEFT_RIGHT
 			}
-//    if (bitcount(wall_collision) > 1) {
-//  				collision |= wall_collision
-// 			}
 		})
 		return collision
 	}
-
-  Room.prototype.setFloorColor = function(rgbColor) {
-    this.mx_floor.map(function(mx){
-      mx.el.style.backgroundColor = rgbColor
-    })
-  }
-  
-  Room.prototype.setCeilingColor = function(rgbColor) {
-    this.mx_ceiling.map(function(mx){
-      mx.el.style.backgroundColor = rgbColor
-    })
-  }
-
+	
 	if ('window' in this) {
 		window.Room = Room
 	}