From e909f8ec12a707e90d83f380e60a8e6c46a2f4e3 Mon Sep 17 00:00:00 2001 From: Arthur Date: Sat, 31 Dec 2022 21:06:39 -0500 Subject: [PATCH 1/2] Fixes Issue #711 --- src/p_map.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/p_map.c b/src/p_map.c index 5c8ccbb19..f738cb97d 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -264,11 +264,13 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) { INT32 pflags = object->player->pflags & (PF_JUMPED|PF_NOJUMPDAMAGE|PF_SPINNING|PF_THOKKED|PF_BOUNCING); // Not identical to below... UINT8 secondjump = object->player->secondjump; + UINT16 tailsfly = object->player->powers[pw_tailsfly]; if (object->player->pflags & PF_GLIDING) P_SetPlayerMobjState(object, S_PLAY_FALL); P_ResetPlayer(object->player); object->player->pflags |= pflags; object->player->secondjump = secondjump; + object->player->powers[pw_tailsfly] = tailsfly; } } From 20724ad70bc44eee8d8c10c32cfbf88be94ef2f9 Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 27 Jan 2023 09:46:02 -0500 Subject: [PATCH 2/2] Also retain PF_CANCARRY --- src/p_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_map.c b/src/p_map.c index f738cb97d..54e2003ba 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -262,7 +262,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) } else { - INT32 pflags = object->player->pflags & (PF_JUMPED|PF_NOJUMPDAMAGE|PF_SPINNING|PF_THOKKED|PF_BOUNCING); // Not identical to below... + INT32 pflags = object->player->pflags & (PF_JUMPED|PF_NOJUMPDAMAGE|PF_SPINNING|PF_THOKKED|PF_BOUNCING|PF_CANCARRY); // Not identical to below... UINT8 secondjump = object->player->secondjump; UINT16 tailsfly = object->player->powers[pw_tailsfly]; if (object->player->pflags & PF_GLIDING)