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
This commit is contained in:
Wanne
2014-05-06 08:12:28 +00:00
parent 7163b0d9a5
commit 0e1670bf21
+3 -3
View File
@@ -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( );
}
}