summaryrefslogtreecommitdiff
path: root/assets/javascripts/mx/extensions/mx.movements.js
diff options
context:
space:
mode:
Diffstat (limited to 'assets/javascripts/mx/extensions/mx.movements.js')
-rw-r--r--assets/javascripts/mx/extensions/mx.movements.js8
1 files changed, 3 insertions, 5 deletions
diff --git a/assets/javascripts/mx/extensions/mx.movements.js b/assets/javascripts/mx/extensions/mx.movements.js
index 164d747..2f377cb 100644
--- a/assets/javascripts/mx/extensions/mx.movements.js
+++ b/assets/javascripts/mx/extensions/mx.movements.js
@@ -222,10 +222,10 @@ MX.Movements = function (cam, viewHeight) {
vz += v * Math.sin(ry) * s
}
if (moveUp) {
- vy += v * scale
+ pos.y += v * scale
}
if (moveDown) {
- vy -= v * scale
+ pos.y -= v * scale
}
if (turnUp) {
@@ -242,7 +242,6 @@ MX.Movements = function (cam, viewHeight) {
}
pos.x += vx
- pos.y += vy
pos.z += vz
}
@@ -265,7 +264,6 @@ MX.Movements = function (cam, viewHeight) {
pos.y = ceiling
vz = vz || 1
}
-
}
if (vx || vy || vz) {
@@ -277,7 +275,7 @@ MX.Movements = function (cam, viewHeight) {
unlock: function(){ locked = false },
scale: function(n){ if (n) scale = n; return scale },
resetScale: function(n){ scale = DEFAULT_SCALE },
- gravity: function(g){ gravity = g },
+ gravity: function(g){ return typeof g == "boolean" ? gravity = g : gravity },
velocity: function(n){ v = clamp(n, 1, 50) },
jumpVelocity: function(n){ jumpV = clamp(n, 1, 50) },
}