From c7139a25690460428a5a0773e3d6fcbc4bfe617b Mon Sep 17 00:00:00 2001 From: Shadooow Date: Tue, 26 Oct 2021 22:44:19 +0000 Subject: [PATCH] using an item will now close EDB if opened, this fixed bug where attaching a 40mm grenade into laucher via EDB box and firing from it without closing it didn't substract AP for attaching the grenade git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9197 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Handle Items.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp index 28d25768c..c571ecf00 100644 --- a/Tactical/Handle Items.cpp +++ b/Tactical/Handle Items.cpp @@ -257,6 +257,12 @@ INT32 HandleItem( SOLDIERTYPE *pSoldier, INT32 sGridNo, INT8 bLevel, UINT16 usHa UINT16 usRaiseGunCost = 0; UINT16 usTurningCost = 0; + //shadooow: automatically close EDB when opened and trying to use any weapon or action + if (gfInItemDescBox) + { + DeleteItemDescriptionBox(); + } + // Remove any previous actions pSoldier->aiData.ubPendingAction = NO_PENDING_ACTION;