Merge branch 'bot-respawn-fix' into 'next'

Bot respawn fix

See merge request STJr/SRB2!423
This commit is contained in:
Digiku 2018-12-24 15:53:47 -05:00
commit 2e6f382ec3

View file

@ -7630,6 +7630,9 @@ static void P_DeathThink(player_t *player)
if (player->deadtimer < INT32_MAX)
player->deadtimer++;
if (player->bot) // don't allow bots to do any of the below, B_CheckRespawn does all they need for respawning already
goto notrealplayer;
// continue logic
if (!(netgame || multiplayer) && player->lives <= 0)
{
@ -7749,6 +7752,8 @@ static void P_DeathThink(player_t *player)
}
}
notrealplayer:
if (!player->mo)
return;