From e62684f0e1e681e16a3c5e34b230b5a786232d61 Mon Sep 17 00:00:00 2001
From: Asdow <20314541+Asdow@users.noreply.github.com>
Date: Mon, 18 Nov 2024 18:50:20 +0200
Subject: [PATCH] Convert GetSoldierIDFromMercID() to SoldierID

---
 Tactical/Soldier Add.cpp | 4 ++--
 Tactical/Soldier Add.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Tactical/Soldier Add.cpp b/Tactical/Soldier Add.cpp
index ef769a86..a10c6cc2 100644
--- a/Tactical/Soldier Add.cpp	
+++ b/Tactical/Soldier Add.cpp	
@@ -1788,7 +1788,7 @@ BOOLEAN IsMercOnTeam(UINT8 ubMercID, BOOLEAN aAlreadyInCountry, BOOLEAN aAlive)
 
 
 // GetSoldierIDFromMercID() Gets the Soldier ID from the Merc Profile ID, else returns -1
-INT16 GetSoldierIDFromMercID(UINT8 ubMercID)
+SoldierID GetSoldierIDFromMercID(UINT8 ubMercID)
 {
 	SOLDIERTYPE		*pTeamSoldier = NULL;
 
@@ -1804,7 +1804,7 @@ INT16 GetSoldierIDFromMercID(UINT8 ubMercID)
 		}
 	}
 
-	return -1 ;
+	return NOBODY;
 }
 
 
diff --git a/Tactical/Soldier Add.h b/Tactical/Soldier Add.h
index 32aa90dd..3f67759a 100644
--- a/Tactical/Soldier Add.h	
+++ b/Tactical/Soldier Add.h	
@@ -41,8 +41,8 @@ BOOLEAN IsMercOnTeam( UINT8 ubMercID, BOOLEAN aAlreadyInCountry, BOOLEAN aAlive
 
 
 
-// GetSoldierIDFromMercID() Gets the Soldier ID from the Merc Profile ID, else returns -1
-INT16 GetSoldierIDFromMercID(UINT8 ubMercID);
+// GetSoldierIDFromMercID() Gets the Soldier ID from the Merc Profile ID, else returns NOBODY
+SoldierID GetSoldierIDFromMercID(UINT8 ubMercID);
 
 INT32 FindGridNoFromSweetSpotWithStructData( SOLDIERTYPE *pSoldier, UINT16 usAnimState, INT32 sSweetGridNo, INT8 ubRadius, UINT8 *pubDirection, BOOLEAN fClosestToMerc );