From b5835754cce8f8412a3fac53d9d5dce0567961c6 Mon Sep 17 00:00:00 2001 From: Flugente Date: Wed, 5 Jun 2013 19:38:41 +0000 Subject: [PATCH] Fixed display bar of attached ammo git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6115 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Interface Utils.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Tactical/Interface Utils.cpp b/Tactical/Interface Utils.cpp index a668d8562..400fd31de 100644 --- a/Tactical/Interface Utils.cpp +++ b/Tactical/Interface Utils.cpp @@ -454,8 +454,15 @@ void DrawItemUIBarEx( OBJECTTYPE *pObject, UINT8 ubStatus, INT16 sXPos, INT16 sY { sValue = 0; OBJECTTYPE* pAttachment = (*pObject)[iter]->GetAttachmentAtIndex( ubStatus - DRAW_ITEM_STATUS_ATTACHMENT1 ); - if (pAttachment->exists()) { + if (pAttachment->exists()) + { sValue = (*pAttachment)[iter]->data.objectStatus; + + if( Item[ pAttachment->usItem ].usItemClass & IC_AMMO ) + { + sValue = sValue * 100 / Magazine[ Item[ pObject->usItem ].ubClassIndex ].ubMagSize; + sValue = max(0, min(100, sValue)); + } } } else