From e9a13e12d8d6c8524e271b90bdf987587f93bbac Mon Sep 17 00:00:00 2001
From: Asdow <20314541+Asdow@users.noreply.github.com>
Date: Sun, 17 Nov 2024 17:11:03 +0200
Subject: [PATCH] Convert to SoldierID

---
 Multiplayer/client.cpp    | 2 +-
 Tactical/Handle Items.cpp | 2 +-
 Tactical/Handle Items.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Multiplayer/client.cpp b/Multiplayer/client.cpp
index e4d40437..4d967455 100644
--- a/Multiplayer/client.cpp
+++ b/Multiplayer/client.cpp
@@ -3793,7 +3793,7 @@ void recieveSTATE(RPCParameters *rpcParameters)
 {
 	EV_S_CHANGESTATE*	new_state = (EV_S_CHANGESTATE*)rpcParameters->input;
 
-	SOLDIERTYPE * pSoldier=MercPtrs[ new_state->usSoldierID ];
+	SOLDIERTYPE * pSoldier = new_state->usSoldierID;
 
 	if(pSoldier->bActive)
 	{
diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp
index 56311613..de09582e 100644
--- a/Tactical/Handle Items.cpp	
+++ b/Tactical/Handle Items.cpp	
@@ -7800,7 +7800,7 @@ BOOLEAN	BuildStructFromName( INT32 sGridNo, INT8 sLevel, const char* aStr, UINT8
 
 SoldierID gusTempDragBuildSoldierID = NOBODY;
 
-BOOLEAN	BuildStructDrag( INT32 sGridNo, INT8 sLevel, UINT32 uiTileType, UINT8 usIndex, UINT16 usSoldierID )
+BOOLEAN	BuildStructDrag( INT32 sGridNo, INT8 sLevel, UINT32 uiTileType, UINT8 usIndex, SoldierID usSoldierID )
 {
 	// needs to be a valid location
 	if ( TileIsOutOfBounds( sGridNo ) )
diff --git a/Tactical/Handle Items.h b/Tactical/Handle Items.h
index 2f523798..596b889a 100644
--- a/Tactical/Handle Items.h	
+++ b/Tactical/Handle Items.h	
@@ -297,7 +297,7 @@ BOOLEAN	IsDragStructurePresent( INT32 sGridNo, INT8 sLevel, UINT32& arusTileType
 void	GetDragStructureXmlEntry( UINT32 ausTileType, UINT16 ausStructureNumber, int& arXmlVectorEntry );
 BOOLEAN	RemoveStructDrag( INT32 sGridNo, INT8 sLevel, UINT32 uiTileType );
 void	CorrectDragStructData( INT32 sGridNo, INT8 sLevel, UINT8 ausHitpoints, UINT8 ausDecalFlags );
-BOOLEAN	BuildStructDrag( INT32 sGridNo, INT8 sLevel, UINT32 uiTileType, UINT8 usIndex, UINT16 usSoldierID );
+BOOLEAN	BuildStructDrag( INT32 sGridNo, INT8 sLevel, UINT32 uiTileType, UINT8 usIndex, SoldierID usSoldierID );
 
 void UpdateFortificationPossibleAmount();
 void HandleFortificationUpdate();