1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

BUGFIX 534 - Added code to restrict non-ammo item status to 100.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4515 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
ChrisL
2011-06-21 15:33:39 +00:00
parent f14fa1f66d
commit 19416a395b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Items.cpp
+6
View File
@@ -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;
}