From 7b05ffd92d101d58aaaf8f5234413ff4ab8a0dd1 Mon Sep 17 00:00:00 2001
From: SMS Alfredo <65426124+SMS-Alfredo@users.noreply.github.com>
Date: Mon, 23 Nov 2020 09:18:05 -0600
Subject: [PATCH] Revert "Fix no spin characters being able to damage enemies
with their jump out of a spin without removing PF_SPINNING"
This reverts commit ad9bf6085f0845c9fde5348c7299136735a83d84.
---
src/p_user.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/p_user.c b/src/p_user.c
index 0ffa5e1af..2ec8f5995 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1135,8 +1135,7 @@ boolean P_PlayerCanDamage(player_t *player, mobj_t *thing)
return true;
// Spinning.
- if ((player->pflags & PF_SPINNING)
- && !((player->pflags & PF_JUMPED) && (player->pflags & PF_NOJUMPDAMAGE)))
+ if (player->pflags & PF_SPINNING)
return true;
if (player->dashmode >= DASHMODE_THRESHOLD && (player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE))
@@ -4526,6 +4525,7 @@ void P_DoJump(player_t *player, boolean soundandstate)
player->mo->eflags &= ~MFE_APPLYPMOMZ;
player->pflags |= P_GetJumpFlags(player);;
+ player->pflags &= ~PF_SPINNING;
if (soundandstate)
{
--
GitLab