From c58d789a07afb905a68d0c85055c4b9d74e7c36a Mon Sep 17 00:00:00 2001 From: James R Date: Thu, 24 Feb 2022 22:51:01 -0800 Subject: [PATCH 1/2] Always reset tiregrease --- src/p_map.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_map.c b/src/p_map.c index a70ac1263..00bcfe378 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -436,9 +436,9 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) P_InitAngle(grease, K_MomentumAngle(object)); grease->extravalue1 = i; } - - object->player->tiregrease = greasetics; //FixedMul(greasetics << FRACBITS, finalSpeed/72) >> FRACBITS } + + object->player->tiregrease = greasetics; //FixedMul(greasetics << FRACBITS, finalSpeed/72) >> FRACBITS } return true; From a3eab3099edba0fc11c5f4dcb28eb84a210b205f Mon Sep 17 00:00:00 2001 From: toaster Date: Sat, 12 Mar 2022 23:18:55 +0000 Subject: [PATCH 2/2] Solve the concern about potential tiregrease overwriting. Let the video resume at once --- src/p_map.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/p_map.c b/src/p_map.c index 00bcfe378..8b07a4e32 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -438,7 +438,10 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) } } - object->player->tiregrease = greasetics; //FixedMul(greasetics << FRACBITS, finalSpeed/72) >> FRACBITS + if (object->player->tiregrease < greasetics) + { + object->player->tiregrease = greasetics; + } } return true;