zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-25 05:31:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- let non-solid teleporting actors not actually telefrag.

Browse source 
Since they are non-solid they may just be allowed to teleport, even when a monster or player is in the way.
This commit is contained in:
Christoph Oelckers 2020-09-26 18:46:39 +02:00
parent c3dc84297e
commit 2ffb447f9e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/playsim/p_map.cpp
View file

@ -474,7 +474,7 @@ bool P_TeleportMove(AActor* thing, const DVector3 &pos, bool telefrag, bool modi
continue; continue;
// Don't let players and monsters block item teleports (all other actor types will still block.) // 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; continue;
// monsters don't stomp things except on boss level // monsters don't stomp things except on boss level