mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-03-13 22:56:28 +00:00
Revert "Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING"
This reverts commit 826a4429dd.
This commit is contained in:
parent
fee455ec7a
commit
21d9e870aa
1 changed files with 2 additions and 2 deletions
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue