summaryrefslogtreecommitdiff
path: root/assets/javascripts/rectangles/engine/mover.js
diff options
context:
space:
mode:
Diffstat (limited to 'assets/javascripts/rectangles/engine/mover.js')
-rw-r--r--assets/javascripts/rectangles/engine/mover.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/assets/javascripts/rectangles/engine/mover.js b/assets/javascripts/rectangles/engine/mover.js
index 66c1813..71656ef 100644
--- a/assets/javascripts/rectangles/engine/mover.js
+++ b/assets/javascripts/rectangles/engine/mover.js
@@ -28,12 +28,15 @@ var mover = new function(){
}
// check if we've breached one of the walls.. clamp position if so
- var collision = base.room.collides(pos.x, pos.z, radius)
+ var collision = base.room.collidesDisc(pos.x, pos.z, radius)
if (collision) {
if (! (collision & LEFT_RIGHT)) {
cam.x = base.room.rect.x.clampDisc(pos.x, radius)
}
+ else {
+ // cam.x = base.room.rect.x.clampDisc(pos.x, radius)
+ }
if (! (collision & FRONT_BACK)) {
cam.z = base.room.rect.y.clampDisc(pos.z, radius)
}