merge

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
 			}