summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/mx
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-11-03 15:59:08 -0500
committerJules Laplace <jules@okfoc.us>2014-11-03 15:59:08 -0500
commit64748a6d55f1e4d08270367767b631b724833b19 (patch)
treedc54c30208fca09451c3cf5165bf715e3545beeb /public/assets/javascripts/mx
parent21ca0470b4b7731e0ab527a52d53aa308cad41d1 (diff)
parent16e4733522018477062abd8d60837c2bd69a93cb (diff)
merge
Diffstat (limited to 'public/assets/javascripts/mx')
-rw-r--r--public/assets/javascripts/mx/extensions/mx.movements.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 2993fb6..dc9660b 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -326,15 +326,13 @@ MX.Movements = function (cam) {
pos.y = viewHeight
vy = 0
jumping = false
- vz = vz || 1
}
var ceiling = (Rooms.mover.room ? Rooms.mover.room.height : 5000)
- if (pos.y >= ceiling) {
+ if (pos.y >= ceiling-5) {
vy = 0
- pos.y = ceiling
- vz = vz || 1
+ pos.y = ceiling-5
}
}