From 000e865f80f3e4f7e77184cc140eaf0dabb1c09b Mon Sep 17 00:00:00 2001
From: lachablock <lachlanwright17@gmail.com>
Date: Thu, 25 Mar 2021 21:42:25 +1100
Subject: [PATCH] Revise spinheight/gap entry conditions (again), let's keep
 things WAY simpler: - PF_NOJUMPDAMAGE no longer affects height at all (you're
 welcome katsy). - Characters with SF_NOJUMPSPIN will only use spinheight when
 panim is PA_ROLL. They cannot enter gaps when jumping with spinheight, unless
 also spinning or gliding. - All other characters use spinheight when panim is
 PA_JUMP or PA_ROLL. They can enter gaps when jumping with spinheight.

---
 src/p_user.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/p_user.c b/src/p_user.c
index 56767f433d..6c7cdb0d07 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -12958,9 +12958,7 @@ boolean P_PlayerFullbright(player_t *player)
 
 #define JUMPCURLED(player) ((player->pflags & PF_JUMPED)\
 	&& (!(player->charflags & SF_NOJUMPSPIN))\
-	&& (!(player->pflags & PF_NOJUMPDAMAGE)\
-		|| ((player->charflags & SF_NOJUMPDAMAGE)\
-		&& (player->panim == PA_JUMP || player->panim == PA_ROLL))))\
+	&& (player->panim == PA_JUMP || player->panim == PA_ROLL))\
 
 // returns true if the player can enter a sector that they could not if standing at their skin's full height
 boolean P_PlayerCanEnterSpinGaps(player_t *player)
-- 
GitLab