Skip to content

Commit

Permalink
- let non-solid teleporting actors not actually telefrag.
Browse files Browse the repository at this point in the history
Since they are non-solid they may just be allowed to teleport, even when a monster or player is in the way.
  • Loading branch information
coelckers committed Sep 26, 2020
1 parent c3dc842 commit 2ffb447
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/playsim/p_map.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2ffb447

Please sign in to comment.