From 2ffb447f9ed84fa7140accb87f5d65b67ea81ba5 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 26 Sep 2020 18:46:39 +0200 Subject: [PATCH] - let non-solid teleporting actors not actually telefrag. Since they are non-solid they may just be allowed to teleport, even when a monster or player is in the way. --- src/playsim/p_map.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/playsim/p_map.cpp b/src/playsim/p_map.cpp index 402e89cc8c..4753acec75 100644 --- a/src/playsim/p_map.cpp +++ b/src/playsim/p_map.cpp @@ -474,7 +474,7 @@ bool P_TeleportMove(AActor* thing, const DVector3 &pos, bool telefrag, bool modi continue; // Don't let players and monsters block item teleports (all other actor types will still block.) - if (thing->IsKindOf(NAME_Inventory) && !(thing->flags & MF_SOLID) && ((th->flags3 & MF3_ISMONSTER) || th->player != nullptr)) + if ((thing->IsKindOf(NAME_Inventory) || (thing->flags2 & MF2_TELESTOMP)) && !(thing->flags & MF_SOLID) && ((th->flags3 & MF3_ISMONSTER) || th->player != nullptr)) continue; // monsters don't stomp things except on boss level