From d3d14d2c47804a0c150e5418bf922957546c4237 Mon Sep 17 00:00:00 2001 From: Wanne Date: Tue, 26 Nov 2013 11:44:29 +0000 Subject: [PATCH] Bugfix: This small patch fixes bug with remote explosives not being removed after activation, if they were armed in inventory and thrown afterwards (by Sevenfm) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6654 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/World Items.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Tactical/World Items.cpp b/Tactical/World Items.cpp index 020e02780..62ec10c62 100644 --- a/Tactical/World Items.cpp +++ b/Tactical/World Items.cpp @@ -488,6 +488,9 @@ INT32 AddItemToWorld( INT32 sGridNo, OBJECTTYPE *pObject, UINT8 ubLevel, UINT16 pSoldier = MercPtrs[ soldierID ]; } } + // sevenfm: added flag WORLD_ITEM_ARMED_BOMB + // this fixes bug with remote explosives not being removed after activation, if they were armed in inventory and thrown afterwards + gWorldItems[ iItemIndex ].usFlags |= WORLD_ITEM_ARMED_BOMB; if (pSoldier != NULL) {