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

Accidentially broke game overs. Fixed now.

This commit is contained in:
toasterbabe 2017-05-30 17:07:37 +01:00
parent 947e9ed34f
commit 9fbcd6e883
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/p_user.c
View File

@ -8260,7 +8260,7 @@ static void P_DeathThink(player_t *player)
player->playerstate = PST_REBORN;
}
}
else if ((netgame || multiplayer) && player->deadtimer == 8*TICRATE)
else if ((netgame || multiplayer) && player->deadtimer >= 8*TICRATE)
{
INT32 i, deadtimercheck = INT32_MAX;
@ -8270,7 +8270,9 @@ static void P_DeathThink(player_t *player)
{
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && !players[i].exiting && players[i].lives)
if (!playeringame[i])
continue;
if (!players[i].exiting && players[i].lives)
break;
if (players[i].deadtimer < deadtimercheck)
deadtimercheck = players[i].deadtimer;
@ -8288,7 +8290,9 @@ static void P_DeathThink(player_t *player)
{
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && (players[i].exiting || players[i].lives))
if (!playeringame[i])
continue;
if (players[i].exiting || players[i].lives)
break;
if (players[i].deadtimer < deadtimercheck)
deadtimercheck = players[i].deadtimer;