From 65a8b4fd7712af6f2895c4cdf089ac71ec2831d0 Mon Sep 17 00:00:00 2001 From: Asdow <20314541+Asdow@users.noreply.github.com> Date: Wed, 20 Nov 2024 21:19:28 +0200 Subject: [PATCH] Use SoldierID --- Tactical/Merc Hiring.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Tactical/Merc Hiring.cpp b/Tactical/Merc Hiring.cpp index 5cdb9f00d..9cc5525b8 100644 --- a/Tactical/Merc Hiring.cpp +++ b/Tactical/Merc Hiring.cpp @@ -211,18 +211,18 @@ INT8 HireMerc( MERC_HIRE_STRUCT *pHireMerc) // make an objecttype CreateItem(LETTER, 100, &gTempObject); // 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 if(!fReturn) { if (UsingNewInventorySystem()) { - (MercPtrs[iNewIndex]->inv[NUM_INV_SLOTS-1]) = gTempObject; + (iNewIndex->inv[NUM_INV_SLOTS-1]) = gTempObject; fReturn=TRUE; } else { - (MercPtrs[iNewIndex]->inv[SMALLPOCK8POS]) = gTempObject; + (iNewIndex->inv[SMALLPOCK8POS]) = gTempObject; fReturn = TRUE; } } @@ -239,7 +239,7 @@ INT8 HireMerc( MERC_HIRE_STRUCT *pHireMerc) //record how long the merc will be gone for pMerc->bMercStatus = (UINT8)pHireMerc->iTotalContractLength; - pSoldier = &Menptr[iNewIndex]; + pSoldier = iNewIndex; //Copy over insertion data.... pSoldier->ubStrategicInsertionCode = pHireMerc->ubInsertionCode;