stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-20 00:11:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING

Browse source
This commit is contained in:
SMS Alfredo 2020-11-18 11:28:31 -06:00
parent fb40a28365
commit ad9bf6085f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_user.c
View file

@ -1135,7 +1135,8 @@ boolean P_PlayerCanDamage(player_t *player, mobj_t *thing)
return true; return true;
// Spinning. // Spinning.
if (player->pflags & PF_SPINNING) if ((player->pflags & PF_SPINNING)
&& !((player->pflags & PF_JUMPED) && (player->pflags & PF_NOJUMPDAMAGE)))
return true; return true;
if (player->dashmode >= DASHMODE_THRESHOLD && (player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE)) if (player->dashmode >= DASHMODE_THRESHOLD && (player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE))
@ -4524,7 +4525,6 @@ void P_DoJump(player_t *player, boolean soundandstate)
player->mo->eflags &= ~MFE_APPLYPMOMZ; player->mo->eflags &= ~MFE_APPLYPMOMZ;
player->pflags |= P_GetJumpFlags(player);; player->pflags |= P_GetJumpFlags(player);;
player->pflags &= ~PF_SPINNING;
if (soundandstate) if (soundandstate)
{ {