1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

AddSoldierToSector & OBJECTTYPE::soldierID changed to SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-16 20:55:08 +02:00
parent 42d5ecb923
commit 2918801f75
12 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Panels.cpp
+2 -2
View File
@@ -4209,7 +4209,7 @@ BOOLEAN ChangeDropPackStatus(SOLDIERTYPE *pSoldier, BOOLEAN newStatus)
{
if(gWorldItems[wi].soldierID == pSoldier->ubID)
{
gWorldItems[wi].soldierID = -1;
gWorldItems[wi].soldierID = NOBODY;
}
}
MoveItemToLBEItem( pSoldier, BPACKPOCKPOS );
@@ -4231,7 +4231,7 @@ BOOLEAN ChangeDropPackStatus(SOLDIERTYPE *pSoldier, BOOLEAN newStatus)
//CHRISL: There's the remote chance that a non-LBE item might get associated with a merc. If that happens, we can
// have a CTD, so lets resolve that here.
if(Item[gWorldItems[wi].object.usItem].usItemClass != IC_LBEGEAR)
gWorldItems[wi].soldierID = -1;
gWorldItems[wi].soldierID = NOBODY;
if(gWorldItems[wi].soldierID == pSoldier->ubID && gWorldItems[wi].fExists == TRUE && Item[gWorldItems[wi].object.usItem].usItemClass == IC_LBEGEAR && LoadBearingEquipment[Item[gWorldItems[wi].object.usItem].ubClassIndex].lbeClass == BACKPACK)
{
for (int x = 0; x < gWorldItems[wi].object.ubNumberOfObjects; ++x) {