From 486e07300c0ab4c6f79814a16c159f075f49e090 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 16 Jun 2020 01:11:08 +0200 Subject: [PATCH] - fixed: Inventory items that are terminated by GoAwayAndDie must be removed from the blockmap and sector lists. Since they were just scheduled for delayed deletion any map related action they can trigger is unwanted. --- wadsrc/static/zscript/actors/inventory/inventory.zs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wadsrc/static/zscript/actors/inventory/inventory.zs b/wadsrc/static/zscript/actors/inventory/inventory.zs index b4ee7da002..c0577e2d24 100644 --- a/wadsrc/static/zscript/actors/inventory/inventory.zs +++ b/wadsrc/static/zscript/actors/inventory/inventory.zs @@ -986,6 +986,10 @@ class Inventory : Actor if (!GoAway ()) { bSpecial = false; + if (!bNoBlockmap || !bNoSector) // make sure that the item no longer interacts with the world for the short rest of its life. + { + A_ChangeLinkFlags(1, 1); + } SetStateLabel("HoldAndDestroy"); } }