merge

1 files changed, 2 insertions, 4 deletions

diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js
index b0344a1..26bf055 100644
--- a/public/assets/javascripts/rectangles/models/room.js
+++ b/public/assets/javascripts/rectangles/models/room.js
@@ -122,7 +122,8 @@
 		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,9 +153,6 @@
 			if (contains_y) {
 				collision |= wall_collision & LEFT_RIGHT
 			}
-//    if (bitcount(wall_collision) > 1) {
-//  				collision |= wall_collision
-// 		}
 		})
 		return collision
 	}