From 0e1670bf21ffe6767657f5cc4d3d356fdc6bedbb Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 6 May 2014 08:12:28 +0000
Subject: [PATCH] Merged from revision: 7191 Bugfix: when attached, the under
 barrel weapon's loaded rounds cannot be modified unless fired (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7192 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Interface Items.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp
index 8da30db2..b65ef319 100644
--- a/Tactical/Interface Items.cpp	
+++ b/Tactical/Interface Items.cpp	
@@ -6356,11 +6356,11 @@ void ItemDescAttachmentsCallback( MOUSE_REGION * pRegion, INT32 iReason )
 
 			Object2 = *pAttachment;
 			gfItemDescObjectIsAttachment = TRUE;
-			InternalInitItemDescriptionBox( &Object2, gsInvDescX, gsInvDescY, 0, gpItemDescSoldier );
+			//InternalInitItemDescriptionBox( &Object2, gsInvDescX, gsInvDescY, 0, gpItemDescSoldier );
+			InternalInitItemDescriptionBox( pAttachment, gsInvDescX, gsInvDescY, 0, gpItemDescSoldier );
 
 			if ( fShopkeeperItem )
-			{
-				pShopKeeperItemDescObject = &Object2;
+			{				pShopKeeperItemDescObject = &Object2;
 				StartSKIDescriptionBox( );
 			}
 		}