From 213a0caa23f3651a50e30262af256c4d45cada52 Mon Sep 17 00:00:00 2001 From: Yukita Mayako Date: Fri, 29 May 2015 05:47:01 -0400 Subject: [PATCH] Hotfix amendment Also gain velocity from walking off an "up" elevator normally? This _looks_ incorrect because the camera stops matching the platform movement the moment you step off, but I assure you it is a correct and accurate movement. (Try it with chasecam off.) --- src/p_mobj.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index f1fc6bb7..4796e18b 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -1986,8 +1986,14 @@ static void P_PlayerZMovement(mobj_t *mo) (FixedMul(cv_viewheight.value<scale) - mo->player->viewheight)>>3; } - if (mo->pmomz && mo->z > mo->floorz) + // adjust height + if (mo->pmomz && !P_IsObjectOnGround(mo)) + { + if ((mo->eflags & MFE_VERTICALFLIP && mo->pmomz < 0) + || (!(mo->eflags & MFE_VERTICALFLIP) && mo->pmomz > 0)) + mo->momz += mo->pmomz; mo->pmomz = 0; + } mo->z += mo->momz;