From a4cfec6ec7d5f39d455a45a9383751ce16cb8d0f Mon Sep 17 00:00:00 2001 From: Wanne Date: Tue, 5 Jun 2012 07:55:36 +0000 Subject: [PATCH] - Bugfix: Fixed a bug that could cause sector items to be identified as bombs altough they weren't (by Flugente) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5330 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/World Items.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tactical/World Items.cpp b/Tactical/World Items.cpp index 5d6df8d8..2488a57e 100644 --- a/Tactical/World Items.cpp +++ b/Tactical/World Items.cpp @@ -450,7 +450,7 @@ INT32 AddItemToWorld( INT32 sGridNo, OBJECTTYPE *pObject, UINT8 ubLevel, UINT16 // Add a bomb reference if needed // Flugente: we can arm bombs in our inventory and then throw them out, which will cause them to be added to the world. Only way to identify those items is via a check for their bDetonatorType - if (usFlags & WORLD_ITEM_ARMED_BOMB || ( Item[pObject->usItem].usItemClass & (IC_BOMB) && ( (*pObject)[0]->data.misc.bDetonatorType == BOMB_TIMED ) || ( (*pObject)[0]->data.misc.bDetonatorType == BOMB_REMOTE ) ) ) + if (usFlags & WORLD_ITEM_ARMED_BOMB || ( (Item[pObject->usItem].usItemClass & (IC_BOMB)) && ( ( (*pObject)[0]->data.misc.bDetonatorType == BOMB_TIMED ) || ( (*pObject)[0]->data.misc.bDetonatorType == BOMB_REMOTE ) ) ) ) { iReturn = AddBombToWorld( iItemIndex ); if (iReturn == -1)