summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles/models/room.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-10-29 18:25:12 -0400
committerJules Laplace <jules@okfoc.us>2014-10-29 18:25:12 -0400
commitde6fa5bf0e7f0a55341d05f5a5b1dfb19330aeb0 (patch)
tree6706ee7c45cd5bca4222bfaa0f42afb940110761 /public/assets/javascripts/rectangles/models/room.js
parent503c1eb313d01d3a73fac1e31b774749893b55d4 (diff)
stub in fixes to mover
Diffstat (limited to 'public/assets/javascripts/rectangles/models/room.js')
-rw-r--r--public/assets/javascripts/rectangles/models/room.js6
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
}