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

Merge branch 'master' into knuxstuff

Browse source
This commit is contained in:
lachwright 2019-10-28 22:25:32 +08:00
commit 8824cd64fd
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

@ -11727,8 +11727,8 @@ void P_PlayerThink(player_t *player)
else else
player->powers[pw_justsprung] = 0; player->powers[pw_justsprung] = 0;
if (player->powers[pw_pushing] && player->powers[pw_pushing] < UINT16_MAX) if (player->powers[pw_noautobrake] && player->powers[pw_noautobrake] < UINT16_MAX)
player->powers[pw_pushing]--; player->powers[pw_noautobrake]--;
if (player->powers[pw_underwater] && (player->pflags & PF_GODMODE || (player->powers[pw_shield] & SH_PROTECTWATER))) if (player->powers[pw_underwater] && (player->pflags & PF_GODMODE || (player->powers[pw_shield] & SH_PROTECTWATER)))
{ {