zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
{
bool isUnfriendly;
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);
}
bool isUnfriendly = players[playernum].mo && !(players[playernum].mo->flags & MF_FRIENDLY);
// respawn at the start
// first disassociate the corpse