incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next' into rridport

Browse source
This commit is contained in:
NepDisk 2026-03-30 15:54:00 -04:00
commit 0ab3ba7f4a
2 changed files with 1 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

@ -3590,7 +3590,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
}
}
if (betweenmaps)
if (betweenmaps && !(p->jointime <= 1))
return;
if (leveltime < starttime)

1
src/p_mobj.c
View file

@ -12385,7 +12385,6 @@ void P_RespawnSpecials(void)
//
void P_SpawnPlayer(INT32 playernum)
{
UINT8 i;
player_t *p = &players[playernum];
mobj_t *mobj;