mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 12:31:54 +00:00
Merge branch 'master' into knuxstuff
This commit is contained in:
commit
55cc3cf590
1 changed files with 2 additions and 2 deletions
|
|
@ -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)))
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue