From c1421b70cf7e42a92c2d3a2428f18866a917f679 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Wed, 15 Apr 2020 07:02:58 -0400 Subject: [PATCH] Revert "- fixed: player spawn code should now always use defaults for the currently selected player class, not current flags" This reverts commit 8dda7c02c9397abf88392e0043ded0311e924ac6. --- src/g_game.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/g_game.cpp b/src/g_game.cpp index d3f05f88d..0bf781260 100644 --- a/src/g_game.cpp +++ b/src/g_game.cpp @@ -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