1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: items stacking with those that player cannot take from sector inventory when using CTRL+LMB from merc inventory (by Shadooow).

Browse Source 
Fixed some warnings.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8983 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2021-04-27 05:12:21 +00:00
parent 02d2c92f66
commit b12b5dd03a
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Interface Map Inventory.cpp
+8 -7
View File
@@ -2681,13 +2681,14 @@ BOOLEAN AutoPlaceObjectInInventoryStash( OBJECTTYPE *pItemPtr, INT32 sGridNo, IN
while(1) while(1)
{ {
//if we run out of indecies before running out of items to place, make new indecies //if we run out of indices before running out of items to place, make new indices
if(cnt == pInventoryPoolList.size()) if(cnt == pInventoryPoolList.size())
{ {
ResizeInventoryList(); ResizeInventoryList();
} }
pInventorySlot = &pInventoryPoolList[cnt].object; pInventorySlot = &pInventoryPoolList[cnt].object;
if(pInventorySlot->usItem == pItemPtr->usItem)
if(pInventorySlot->usItem == pItemPtr->usItem && pInventoryPoolList[cnt].usFlags & WORLD_ITEM_REACHABLE)
{ {
pInventorySlot->AddObjectsToStack(*pItemPtr); pInventorySlot->AddObjectsToStack(*pItemPtr);
} }
@@ -4993,7 +4994,7 @@ void SortSectorInventoryAmmo(bool useBoxes)
// as possible into crates. // as possible into crates.
// Look through all items in the game to try and find an ammocrate that can contain this kind of ammo. // Look through all items in the game to try and find an ammocrate that can contain this kind of ammo.
for ( int iCrateLoop = 0; iCrateLoop < gMAXITEMS_READ; ++iCrateLoop ) for (INT32 iCrateLoop = 0; iCrateLoop < (INT32)gMAXITEMS_READ; ++iCrateLoop)
{ {
// Is it the right ammo crate? // Is it the right ammo crate?
if( Item[iCrateLoop].usItemClass == IC_AMMO && if( Item[iCrateLoop].usItemClass == IC_AMMO &&
@@ -5043,7 +5044,7 @@ void SortSectorInventoryAmmo(bool useBoxes)
// Dump all the ammo into it. // Dump all the ammo into it.
DistributeStatus(pCurObject, &newCrate, Magazine[Item[crateItem].ubClassIndex].ubMagSize); DistributeStatus(pCurObject, &newCrate, Magazine[Item[crateItem].ubClassIndex].ubMagSize);
// Place it in the sector inventory. // Place it in the sector inventory.
AutoPlaceObjectToWorld( pSoldier, &newCrate, true ); AutoPlaceObjectToWorld(pSoldier, &newCrate, TRUE);
// Ran out of magazines? // Ran out of magazines?
if(pCurObject->ubNumberOfObjects < 1) if(pCurObject->ubNumberOfObjects < 1)
{ {
@@ -5117,7 +5118,7 @@ void SortSectorInventoryEjectAmmo()
pInventoryPoolList[uiLoop].object[x]->data.gun.ubGunAmmoType = NONE; pInventoryPoolList[uiLoop].object[x]->data.gun.ubGunAmmoType = NONE;
// put it on the ground // put it on the ground
AutoPlaceObjectToWorld( pSoldier, &gTempObject, true ); AutoPlaceObjectToWorld(pSoldier, &gTempObject, TRUE);
// Check... // Check...
if (&gTempObject != NULL) if (&gTempObject != NULL)
@@ -5169,7 +5170,7 @@ void SortSectorInventoryEmptyLBE() {
OBJECTTYPE * LBEStack = lbeInvIter._Ptr; OBJECTTYPE * LBEStack = lbeInvIter._Ptr;
dropCnt += LBEStack->ubNumberOfObjects; dropCnt += LBEStack->ubNumberOfObjects;
AutoPlaceObjectToWorld(pSoldier, LBEStack, true); AutoPlaceObjectToWorld(pSoldier, LBEStack, TRUE);
if (LBEStack != NULL) if (LBEStack != NULL)
{ {
DeleteObj(lbeInvIter._Ptr); DeleteObj(lbeInvIter._Ptr);
@@ -5251,7 +5252,7 @@ void SortSectorInventorySeparateAttachments()
{ {
gpTempObject = pNewObj; gpTempObject = pNewObj;
AutoPlaceObjectToWorld(pSoldier, gpTempObject, true); AutoPlaceObjectToWorld(pSoldier, gpTempObject, TRUE);
if (gpTempObject != NULL) if (gpTempObject != NULL)
{ {
DeleteObj(gpTempObject); DeleteObj(gpTempObject);