stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-16 01:31:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Game Over being broken in singleplayer. Woopsie doodle!

Browse source
This commit is contained in:
toasterbabe 2017-07-04 14:57:22 +01:00
parent bc066a16a0
commit a65598a97a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_game.c
View file

@ -2528,7 +2528,7 @@ void G_DoReborn(INT32 playernum)
return;
}
if (countdowntimeup || (!multiplayer && gametype == GT_COOP))
if (countdowntimeup || (!(netgame || multiplayer) && gametype == GT_COOP))
resetlevel = true;
else if (gametype == GT_COOP && (netgame || multiplayer))
{

2
src/p_user.c
View file

@ -8358,7 +8358,7 @@ static void P_DeathThink(player_t *player)
//else if (gametype == GT_COOP) -- moved to G_DoReborn
}
if (gametype == GT_COOP && (player->lives <= 0) && (player->deadtimer >= 8*TICRATE || ((cmd->buttons & BT_JUMP) && (player->deadtimer > TICRATE))))
if (gametype == GT_COOP && (multiplayer || netgame) && (player->lives <= 0) && (player->deadtimer >= 8*TICRATE || ((cmd->buttons & BT_JUMP) && (player->deadtimer > TICRATE))))
{
//player->spectator = true;
player->outofcoop = true;