From c970d7c10087a9a9321bb2c03c49873128769b41 Mon Sep 17 00:00:00 2001 From: lachwright Date: Fri, 25 Oct 2019 18:48:40 +0800 Subject: [PATCH 1/2] Put player in jump state after spinning during a wall transfer --- src/p_mobj.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/p_mobj.c b/src/p_mobj.c index f1dc5d760..60ba7ed2d 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -1990,6 +1990,8 @@ void P_XYMovement(mobj_t *mo) { mo->momz = transfermomz; mo->standingslope = NULL; + if (player->pflags & PF_SPINNING) + player->pflags = (player->pflags & ~PF_SPINNING) | (P_GetJumpFlags(player) | PF_THOKKED); } } #endif From 69692d6088b6666aa1bfc75b98f051fef00e02b7 Mon Sep 17 00:00:00 2001 From: lachwright Date: Fri, 25 Oct 2019 18:51:41 +0800 Subject: [PATCH 2/2] Don't fuck nojumpspin characters who are capable of rolling --- src/p_mobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 60ba7ed2d..1c6e3a7b4 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -1991,7 +1991,7 @@ void P_XYMovement(mobj_t *mo) mo->momz = transfermomz; mo->standingslope = NULL; if (player->pflags & PF_SPINNING) - player->pflags = (player->pflags & ~PF_SPINNING) | (P_GetJumpFlags(player) | PF_THOKKED); + player->pflags = (player->pflags & ~PF_SPINNING) | (PF_JUMPED | PF_THOKKED); } } #endif