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

Use SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-20 21:19:28 +02:00
parent 9d0ec49e88
commit 65a8b4fd77
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Merc Hiring.cpp
+4 -4
View File
@@ -211,18 +211,18 @@ INT8 HireMerc( MERC_HIRE_STRUCT *pHireMerc)
// make an objecttype // make an objecttype
CreateItem(LETTER, 100, &gTempObject); CreateItem(LETTER, 100, &gTempObject);
// Give it // Give it
fReturn = AutoPlaceObject( MercPtrs[iNewIndex], &gTempObject, FALSE ); fReturn = AutoPlaceObject( iNewIndex, &gTempObject, FALSE );
// CHRISL: This condition should resolve the issue of the letter not being issued to the first merc // CHRISL: This condition should resolve the issue of the letter not being issued to the first merc
if(!fReturn) if(!fReturn)
{ {
if (UsingNewInventorySystem()) if (UsingNewInventorySystem())
{ {
(MercPtrs[iNewIndex]->inv[NUM_INV_SLOTS-1]) = gTempObject; (iNewIndex->inv[NUM_INV_SLOTS-1]) = gTempObject;
fReturn=TRUE; fReturn=TRUE;
} }
else else
{ {
(MercPtrs[iNewIndex]->inv[SMALLPOCK8POS]) = gTempObject; (iNewIndex->inv[SMALLPOCK8POS]) = gTempObject;
fReturn = TRUE; fReturn = TRUE;
} }
} }
@@ -239,7 +239,7 @@ INT8 HireMerc( MERC_HIRE_STRUCT *pHireMerc)
//record how long the merc will be gone for //record how long the merc will be gone for
pMerc->bMercStatus = (UINT8)pHireMerc->iTotalContractLength; pMerc->bMercStatus = (UINT8)pHireMerc->iTotalContractLength;
pSoldier = &Menptr[iNewIndex]; pSoldier = iNewIndex;
//Copy over insertion data.... //Copy over insertion data....
pSoldier->ubStrategicInsertionCode = pHireMerc->ubInsertionCode; pSoldier->ubStrategicInsertionCode = pHireMerc->ubInsertionCode;