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

Fix: gear templates: when creating a new ammo stack from non-fitting magazines, fill up the stack

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8518 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-01-22 21:37:51 +00:00
parent dd3129ac11
commit a9452840af
1 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle Items.cpp
+42 -2
View File
@@ -9503,9 +9503,49 @@ void ReadEquipmentTable( SOLDIERTYPE* pSoldier, std::string name )
{
UINT32 poolslot = 0;
UINT8 index = 0;
if ( GetBetterObject_InventoryPool( pObj->usItem, 0, poolslot, index ) )
// if this is ammo, we might still be able to create a mag from different-sized mags
if ( Item[pObj->usItem].usItemClass & IC_AMMO )
{
(pInventoryPoolList[poolslot].object).RemoveObjectAtIndex( index, &gItemPointer );
UINT16 usMagIndex = Item[pObj->usItem].ubClassIndex;
UINT16 neededammo = Magazine[usMagIndex].ubMagSize;
if ( neededammo > 0 )
{
if ( GetFittingAmmo_InventoryPool( Magazine[usMagIndex].ubCalibre, Magazine[usMagIndex].ubAmmoType, poolslot ) )
{
UINT32 takeammo = min( neededammo, pInventoryPoolList[poolslot].object[pInventoryPoolList[poolslot].object.ubNumberOfObjects - 1]->data.ubShotsLeft );
pInventoryPoolList[poolslot].object[pInventoryPoolList[poolslot].object.ubNumberOfObjects - 1]->data.ubShotsLeft -= takeammo;
if ( !pInventoryPoolList[poolslot].object[pInventoryPoolList[poolslot].object.ubNumberOfObjects - 1]->data.ubShotsLeft )
{
pInventoryPoolList[poolslot].object.RemoveObjectAtIndex( pInventoryPoolList[poolslot].object.ubNumberOfObjects - 1 );
}
CreateAmmo( pObj->usItem, &gItemPointer, takeammo );
if ( !PlaceObject( pSoldier, slot, &gItemPointer ) )
{
ScreenMsg( color, MSG_INTERFACE, szGearTemplateText[4], pSoldier->GetName(), Item[pObj->usItem].szItemName );
AutoPlaceObjectInInventoryStash( &gItemPointer, pSoldier->sGridNo, pSoldier->pathing.bLevel );
DeleteObj( &gItemPointer );
}
else
{
// if we are succesful, we will get here, otherwise we break
continue;
}
}
}
break;
}
else if ( GetBetterObject_InventoryPool( pObj->usItem, 0, poolslot, index ) )
{
( pInventoryPoolList[poolslot].object ).RemoveObjectAtIndex( index, &gItemPointer );
if ( !TryToStackInSlot( pSoldier, &gItemPointer, slot ) )
break;