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

Convert to SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-19 01:01:41 +02:00
parent 5b4be9bcdb
commit ff638a5473
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/AimMembers.cpp
+6 -5
View File
@@ -2397,9 +2397,9 @@ INT8 AimMemberHireMerc()
MERC_HIRE_STRUCT HireMercStruct; MERC_HIRE_STRUCT HireMercStruct;
// UINT8 ubCurrentSoldier = AimMercArray[gbCurrentIndex]; // UINT8 ubCurrentSoldier = AimMercArray[gbCurrentIndex];
UINT8 ubCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId; UINT8 ubCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId;
INT8 bReturnCode; INT8 bReturnCode;
INT16 sSoldierID=0; SoldierID sSoldierID = NOBODY;
INT8 bTypeOfContract=0; INT8 bTypeOfContract=0;
if( LaptopSaveInfo.iCurrentBalance < giContractAmount ) if( LaptopSaveInfo.iCurrentBalance < giContractAmount )
@@ -2475,9 +2475,10 @@ INT8 AimMemberHireMerc()
//Set the type of contract the merc is on //Set the type of contract the merc is on
sSoldierID = GetSoldierIDFromMercID( ubCurrentSoldier ); sSoldierID = GetSoldierIDFromMercID( ubCurrentSoldier );
if( sSoldierID == -1 ) if( sSoldierID == NOBODY )
return( FALSE ); return( FALSE );
Menptr[ sSoldierID ].bTypeOfLastContract = bTypeOfContract;
sSoldierID->bTypeOfLastContract = bTypeOfContract;
//add an entry in the finacial page for the hiring of the merc //add an entry in the finacial page for the hiring of the merc