lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

MascaraSnake is a bully and will make a pariah out of me in front of his doctoral student colleagues if I don't change this

Browse source
This commit is contained in:
toaster 2019-11-26 17:10:59 -05:00
parent 6ac44415fb
commit c55a6cb3f8
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_inter.c
View file

@ -148,16 +148,14 @@ void P_ResetStarposts(void)
// //
boolean P_CanPickupItem(player_t *player, boolean weapon) boolean P_CanPickupItem(player_t *player, boolean weapon)
{ {
soniccheck:
if (!player->mo || player->mo->health <= 0) if (!player->mo || player->mo->health <= 0)
return false; return false;
if (player->bot) if (player->bot)
{ {
if (weapon || players[consoleplayer].bot) if (weapon)
return false; return false;
player = &players[consoleplayer]; return P_CanPickupItem(&players[consoleplayer], true); // weapon is true to prevent infinite recursion if p1 is bot - doesn't occur in vanilla, but may be relevant for mods
goto soniccheck;
} }
if (player->powers[pw_flashing] > (flashingtics/4)*3 && player->powers[pw_flashing] < UINT16_MAX) if (player->powers[pw_flashing] > (flashingtics/4)*3 && player->powers[pw_flashing] < UINT16_MAX)