From 3fa04cb091bf54b59f4183ea6d7ad609b4b4ea51 Mon Sep 17 00:00:00 2001 From: lachwright Date: Sun, 24 Nov 2019 18:46:59 +0800 Subject: [PATCH 1/2] Make Metal's vertical float speed technically negative --- src/p_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_user.c b/src/p_user.c index 0838ff80e..0721c22b8 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -5550,7 +5550,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) else potentialmomz = ((player->speed < 10*player->mo->scale) ? (player->speed - 10*player->mo->scale)/5 - : 0); + : -1); if (P_MobjFlip(player->mo)*player->mo->momz < potentialmomz) player->mo->momz = P_MobjFlip(player->mo)*potentialmomz; player->pflags &= ~PF_SPINNING; From 287e8133bb634e0ad5f85ef8d21fc58f3509de82 Mon Sep 17 00:00:00 2001 From: lachwright Date: Tue, 26 Nov 2019 00:20:43 +0800 Subject: [PATCH 2/2] Add comment --- src/p_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_user.c b/src/p_user.c index 0721c22b8..7d7cc48c1 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -5550,7 +5550,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) else potentialmomz = ((player->speed < 10*player->mo->scale) ? (player->speed - 10*player->mo->scale)/5 - : -1); + : -1); // Should be 0, but made negative to ensure P_PlayerHitFloor runs upon touching ground if (P_MobjFlip(player->mo)*player->mo->momz < potentialmomz) player->mo->momz = P_MobjFlip(player->mo)*potentialmomz; player->pflags &= ~PF_SPINNING;