Use SoldierID

This commit is contained in:
Asdow
2024-11-21 23:56:44 +02:00
parent 1ac5d153fb
commit 0d97e36c34
22 changed files with 218 additions and 204 deletions
+4 -4
View File
@@ -116,13 +116,13 @@ BOOLEAN SelectiveFindSoldierFromMouse( SoldierID *pusSoldierIndex, UINT32 *pMerc
}
UINT32 GetSoldierFindFlags( const SoldierID ubID )
UINT32 GetSoldierFindFlags( SoldierID ubID )
{
UINT32 MercFlags = 0;
SOLDIERTYPE *pSoldier;
// Get pSoldier!
pSoldier = MercPtrs[ ubID ];
pSoldier = ubID;
// Find out and set flags
if ( ubID == gusSelectedSoldier )
@@ -530,13 +530,13 @@ SOLDIERTYPE * SimpleFindSoldier( INT32 sGridNo, INT8 bLevel )
}
else
{
return( MercPtrs[ ubID ] );
return( ubID );
}
}
BOOLEAN IsValidTargetMerc( SoldierID ubSoldierID )
{
SOLDIERTYPE *pSoldier = MercPtrs[ ubSoldierID ];
SOLDIERTYPE *pSoldier = ubSoldierID;
// CHECK IF ACTIVE!