diff options
| author | ryderr <r@okfoc.us> | 2014-10-30 13:22:46 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-30 13:22:46 -0400 |
| commit | b6f140dd5908a5f3751d8424e115fc6298b0a366 (patch) | |
| tree | 89ad1afbdddbc4a35c5f48e3b1b2ba14dddbd9a2 /public/assets/javascripts/rectangles/models/room.js | |
| parent | 9fb5df41573c192b1280f30388c55ed6e068454f (diff) | |
| parent | de6fa5bf0e7f0a55341d05f5a5b1dfb19330aeb0 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/rectangles/models/room.js')
| -rw-r--r-- | public/assets/javascripts/rectangles/models/room.js | 6 |
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 } |