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

Revert "Fixed another bug where you were able to use the whirlwind shield ability after using the force shield's dodge dash."

Browse source 
This reverts commit cbe703478c.
This commit is contained in:
toasterbabe 2016-09-30 14:06:53 +01:00
parent cbe703478c
commit dc57a34213
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_user.c
View file

@ -867,8 +867,6 @@ void P_DoPlayerPain(player_t *player, mobj_t *source, mobj_t *inflictor)
// Useful when you want to kill everything the player is doing. // Useful when you want to kill everything the player is doing.
void P_ResetPlayer(player_t *player) void P_ResetPlayer(player_t *player)
{ {
pflags_t removelist = (PF_SPINNING|PF_STARTDASH|PF_JUMPED|PF_GLIDING|PF_THOKKED|PF_CANCARRY|PF_SHIELDABILITY);
if (player->mo if (player->mo
&& player->powers[pw_shield] & SH_FORCE // Dash. && player->powers[pw_shield] & SH_FORCE // Dash.
&& player->pflags & PF_SHIELDABILITY) && player->pflags & PF_SHIELDABILITY)
@ -876,10 +874,9 @@ void P_ResetPlayer(player_t *player)
P_SetPlayerMobjState(player->mo, S_PLAY_FALL); P_SetPlayerMobjState(player->mo, S_PLAY_FALL);
player->mo->flags &= ~MF_NOGRAVITY; player->mo->flags &= ~MF_NOGRAVITY;
player->pflags &= ~PF_FULLSTASIS; player->pflags &= ~PF_FULLSTASIS;
removelist &= ~PF_THOKKED;
} }
player->pflags &= ~removelist; player->pflags &= ~(PF_SPINNING|PF_STARTDASH|PF_JUMPED|PF_GLIDING|PF_THOKKED|PF_CANCARRY|PF_SHIELDABILITY);
player->powers[pw_carry] = CR_NONE; player->powers[pw_carry] = CR_NONE;
player->jumping = 0; player->jumping = 0;
player->secondjump = 0; player->secondjump = 0;