From 19416a395b76227e104cf9ba0c949f06063a595b Mon Sep 17 00:00:00 2001 From: ChrisL Date: Tue, 21 Jun 2011 15:33:39 +0000 Subject: [PATCH] BUGFIX 534 - Added code to restrict non-ammo item status to 100. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4515 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Interface Items.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index cdddaf5d3..1f4c05a58 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -9251,9 +9251,13 @@ void GetHelpTextForItem( STR16 pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldier //CHRISL: Also, determine weight differently if we're looking at a single item in a stack if(subObject == -1){ // Find the minimum status value - not just the first one + if(Item[pObject->usItem].usItemClass != IC_AMMO) + (*pObject)[0]->data.objectStatus = __min((*pObject)[0]->data.objectStatus, 100); sValue = (*pObject)[0]->data.objectStatus; for(INT16 i = 1; i < pObject->ubNumberOfObjects; i++){ + if(Item[pObject->usItem].usItemClass != IC_AMMO) + (*pObject)[ i ]->data.objectStatus = __min((*pObject)[ i ]->data.objectStatus, 100); if((*pObject)[ i ]->data.objectStatus < sValue) { sValue = (*pObject)[ i ]->data.objectStatus; @@ -9264,6 +9268,8 @@ void GetHelpTextForItem( STR16 pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldier subObject = 0; } else { + if(Item[pObject->usItem].usItemClass != IC_AMMO) + (*pObject)[subObject]->data.objectStatus = __min((*pObject)[subObject]->data.objectStatus, 100); sValue = (*pObject)[subObject]->data.objectStatus; fWeight = (float)(pObject->GetWeightOfObjectInStack(subObject)) / 10; }