zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 07:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "- fixed: player spawn code should now always use defaults for the currently selected player class, not current flags"

Browse source 
This reverts commit 8dda7c02c9.
This commit is contained in:
Rachael Alexanderson 2020-04-15 07:02:58 -04:00
parent 8dda7c02c9
commit c1421b70cf
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/g_game.cpp
View file

@ -1707,18 +1707,7 @@ void FLevelLocals::DoReborn (int playernum, bool freshbot)
} }
else else
{ {
bool isUnfriendly; bool isUnfriendly = players[playernum].mo && !(players[playernum].mo->flags & MF_FRIENDLY);
auto p = players[playernum].mo->player;
if (p->cls == NULL)
{
// this shouldn't ever happen! It's just a fall-through in case it does...
isUnfriendly = players[playernum].mo && !(players[playernum].mo->GetDefault()->flags & MF_FRIENDLY);
}
else
{
isUnfriendly = !(GetDefaultByType(p->cls)->flags & MF_FRIENDLY);
}
// respawn at the start // respawn at the start
// first disassociate the corpse // first disassociate the corpse