summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles/engine
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-07-29 17:46:40 -0400
committerJules Laplace <jules@okfoc.us>2014-07-29 17:46:40 -0400
commitd18cb4c622fbb0172b9618d8594953a32ccb88b2 (patch)
tree4ea6ef72c4682aff081d4ce2ead763e437efd2bd /public/assets/javascripts/rectangles/engine
parent4388c9ce2ae680862adb8abaf9d5b34088591a81 (diff)
fix wall clamping bug
Diffstat (limited to 'public/assets/javascripts/rectangles/engine')
-rw-r--r--public/assets/javascripts/rectangles/engine/rooms/mover.js11
1 files changed, 2 insertions, 9 deletions
diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index e67d9bc..7195fcc 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -43,15 +43,8 @@ Rooms.mover = new function(){
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)
- }
+ cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
+ cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
return
}