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

Fix: Equipping militia with guns and ammo could lead to creation of ammo items with 0 bullets.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7518 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-09-14 21:23:16 +00:00
parent 5a0d93da94
commit 48819f860a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Inventory Choosing.cpp
+8 -3
View File
@@ -4660,7 +4660,12 @@ void TakeMilitiaEquipmentfromSector( INT16 sMapX, INT16 sMapY, INT8 sMapZ, SOLDI
(*pObj)[i]->data.ubShotsLeft -= takeammo;
if ( !(*pObj)[i]->data.ubShotsLeft )
pWorldItem[ uiCount ].object.MoveThisObjectTo(gTempObject, 1 );
{
pWorldItem[uiCount].object.RemoveObjectAtIndex( i );
// we removed an item from the stack - set back the loop variable so we don't miss an object
--i;
}
}
if ( pWorldItem[ uiCount ].object.ubNumberOfObjects < 1 )
@@ -4668,7 +4673,7 @@ void TakeMilitiaEquipmentfromSector( INT16 sMapX, INT16 sMapY, INT8 sMapZ, SOLDI
if ( pWorldItem[ uiCount ].sGridNo != NOWHERE )
RemoveItemFromPool(pWorldItem[ uiCount ].sGridNo, uiCount, pWorldItem[ uiCount ].ubLevel);
pWorldItem[ uiCount ].fExists = FALSE;
pWorldItem[uiCount].fExists = FALSE;
}
}
}
@@ -4700,7 +4705,7 @@ void TakeMilitiaEquipmentfromSector( INT16 sMapX, INT16 sMapY, INT8 sMapZ, SOLDI
if ( pWorldItem[ uiCount ].sGridNo != NOWHERE )
RemoveItemFromPool(pWorldItem[ uiCount ].sGridNo, uiCount, pWorldItem[ uiCount ].ubLevel);
pWorldItem[ uiCount ].fExists = FALSE;
pWorldItem[uiCount].fExists = FALSE;
}
}
}