From 6722b64ac001f7272748c70651f8042f0f7eef05 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 13 Apr 2020 10:54:40 +0200 Subject: [PATCH] - fixed: Setting 'noallies' on the level cleared the player's friendly flag. The check was for mobj->player, which at this point wasn't set yet so the check failed. --- src/playsim/p_mobj.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/playsim/p_mobj.cpp b/src/playsim/p_mobj.cpp index 097a7f7be..6945bc9a5 100644 --- a/src/playsim/p_mobj.cpp +++ b/src/playsim/p_mobj.cpp @@ -4537,7 +4537,7 @@ void ConstructActor(AActor *actor, const DVector3 &pos, bool SpawningMapThing) return; } } - if (Level->flags & LEVEL_NOALLIES && !actor->player) + if (Level->flags & LEVEL_NOALLIES && !actor->IsKindOf(NAME_PlayerPawn)) { actor->flags &= ~MF_FRIENDLY; }