From 566f8ab5d44b57ed62da336940476082273d27dd Mon Sep 17 00:00:00 2001 From: Shadooow Date: Fri, 24 Sep 2021 01:45:04 +0000 Subject: [PATCH] fixed exploit allowing to steal attachments from vendor items git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9168 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Interface Items.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index d0093e52c..cb223d58e 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -13589,10 +13589,21 @@ void ItemDescTransformRegionCallback( MOUSE_REGION *pRegion, INT32 reason ) { // Behave like the background region, closing the box. OBJECTTYPE *pTemp = gpItemDescPrevObject; + BOOLEAN fShopkeeperItem = FALSE; + // remember if this is a shopkeeper's item we're viewing ( pShopKeeperItemDescObject will get nuked on deletion ) + if (guiTacticalInterfaceFlags & INTERFACE_SHOPKEEP_INTERFACE && pShopKeeperItemDescObject != NULL) + { + fShopkeeperItem = TRUE; + } DeleteItemDescriptionBox( ); if (pTemp != NULL) { InternalInitItemDescriptionBox( pTemp, gsInvDescX, gsInvDescY, 0, gpItemDescSoldier ); + if (fShopkeeperItem) + { + pShopKeeperItemDescObject = pTemp; + StartSKIDescriptionBox(); + } } } }