From 41fc407de698a2e3bc0011f6e252b4bba8a01cb5 Mon Sep 17 00:00:00 2001
From: Asdow <20314541+Asdow@users.noreply.github.com>
Date: Sat, 16 Nov 2024 00:55:51 +0200
Subject: [PATCH] Convert TacticalRemoveSoldier to SoldierID

---
 Tactical/Soldier Create.cpp | 12 ++++--------
 Tactical/Soldier Create.h   |  6 +++---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Tactical/Soldier Create.cpp b/Tactical/Soldier Create.cpp
index f54fc3d5..ae841fb4 100644
--- a/Tactical/Soldier Create.cpp	
+++ b/Tactical/Soldier Create.cpp	
@@ -2148,12 +2148,10 @@ void InitSoldierStruct( SOLDIERTYPE *pSoldier )
 }
 
 
-BOOLEAN InternalTacticalRemoveSoldier( UINT16 usSoldierIndex, BOOLEAN fRemoveVehicle )
+BOOLEAN InternalTacticalRemoveSoldier( SoldierID usSoldierIndex, BOOLEAN fRemoveVehicle )
 {
-	SOLDIERTYPE *		pSoldier;
-
 	// Check range of index given
-	if ( usSoldierIndex < 0 || usSoldierIndex > TOTAL_SOLDIERS-1 )
+	if ( usSoldierIndex >= NOBODY )
 	{
 		// Set debug message
 
@@ -2171,9 +2169,7 @@ BOOLEAN InternalTacticalRemoveSoldier( UINT16 usSoldierIndex, BOOLEAN fRemoveVeh
 		gfUISelectiveTargetFound = FALSE;
 	}
 
-	pSoldier = MercPtrs[ usSoldierIndex ];
-
-	return TacticalRemoveSoldierPointer( pSoldier, fRemoveVehicle );
+	return TacticalRemoveSoldierPointer(usSoldierIndex, fRemoveVehicle );
 }
 
 BOOLEAN TacticalRemoveSoldierPointer( SOLDIERTYPE *pSoldier, BOOLEAN fRemoveVehicle )
@@ -2244,7 +2240,7 @@ BOOLEAN TacticalRemoveSoldierPointer( SOLDIERTYPE *pSoldier, BOOLEAN fRemoveVehi
 	return( TRUE );
 }
 
-BOOLEAN TacticalRemoveSoldier( UINT16 usSoldierIndex )
+BOOLEAN TacticalRemoveSoldier( SoldierID usSoldierIndex )
 {
 	return( InternalTacticalRemoveSoldier( usSoldierIndex, TRUE ) );
 }
diff --git a/Tactical/Soldier Create.h b/Tactical/Soldier Create.h
index d8791d30..03d42673 100644
--- a/Tactical/Soldier Create.h	
+++ b/Tactical/Soldier Create.h	
@@ -451,7 +451,7 @@ public:
 
 
 //Original functions currently used throughout the game.
-BOOLEAN TacticalRemoveSoldier( UINT16 usSoldierIndex );
+BOOLEAN TacticalRemoveSoldier( SoldierID usSoldierIndex );
 BOOLEAN TacticalRemoveSoldierPointer( SOLDIERTYPE *pSoldier, BOOLEAN fRemoveVehicle );
 
 INT8 CalcDifficultyModifier( UINT8 ubSoldierClass );
@@ -562,7 +562,7 @@ void GeneratePaletteForSoldier( SOLDIERTYPE *pSoldier, UINT8 ubSoldierClass, UIN
 
 void QuickCreateProfileMerc( INT8 bTeam, UINT8 ubProfileID );
 
-BOOLEAN InternalTacticalRemoveSoldier( UINT16 usSoldierIndex, BOOLEAN fRemoveVehicle );
+BOOLEAN InternalTacticalRemoveSoldier( SoldierID usSoldierIndex, BOOLEAN fRemoveVehicle );
 
 //SPECIAL!	Certain events in the game can cause profiled NPCs to become enemies.	The two cases are 
 //adding Mike and Iggy.	We will only add one NPC in any given combat and the conditions for setting
@@ -600,4 +600,4 @@ INT32 ChooseHairColor( UINT8 usBodyType, INT32 skin );
 // Flugente: set palettes for vest/shirt
 void SetClothes( SOLDIERTYPE* pSoldier, INT8 aVest, INT8 aPants, INT8 aHair = -1, INT8 aSkin = -1 );
 
-#endif
\ No newline at end of file
+#endif