From 9acf9949524afd9b82f2dc3a21fb1b2e71e81c72 Mon Sep 17 00:00:00 2001
From: Asdow <20314541+Asdow@users.noreply.github.com>
Date: Sun, 17 Nov 2024 16:50:01 +0200
Subject: [PATCH] Convert gusTempDragBuildSoldierID to SoldierID

---
 Tactical/Handle Items.cpp | 2 +-
 TileEngine/structure.cpp  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp
index 2a1a1ba5..56311613 100644
--- a/Tactical/Handle Items.cpp	
+++ b/Tactical/Handle Items.cpp	
@@ -7798,7 +7798,7 @@ BOOLEAN	BuildStructFromName( INT32 sGridNo, INT8 sLevel, const char* aStr, UINT8
 	return FALSE;
 }
 
-UINT16 gusTempDragBuildSoldierID = NOBODY;
+SoldierID gusTempDragBuildSoldierID = NOBODY;
 
 BOOLEAN	BuildStructDrag( INT32 sGridNo, INT8 sLevel, UINT32 uiTileType, UINT8 usIndex, UINT16 usSoldierID )
 {
diff --git a/TileEngine/structure.cpp b/TileEngine/structure.cpp
index bbbfde88..8a2db1fb 100644
--- a/TileEngine/structure.cpp
+++ b/TileEngine/structure.cpp
@@ -630,7 +630,7 @@ STRUCTURE * CreateStructureFromDB( DB_STRUCTURE_REF * pDBStructureRef, UINT8 ubT
 	return( pStructure );
 }
 
-extern UINT16 gusTempDragBuildSoldierID;
+extern SoldierID gusTempDragBuildSoldierID;
 
 BOOLEAN OkayToAddStructureToTile( INT32 sBaseGridNo, INT16 sCubeOffset, DB_STRUCTURE_REF * pDBStructureRef, UINT8 ubTileIndex, INT16 sExclusionID, BOOLEAN fAddingForReal = FALSE, SoldierID sSoldierID = NOBODY )
 {
@@ -942,7 +942,7 @@ BOOLEAN OkayToAddStructureToTile( INT32 sBaseGridNo, INT16 sCubeOffset, DB_STRUC
 			{
 				// Flugente: we allow this if this structure is being dragged by a soldier, otherwise we can't move containers our of rooms (and are likely to unintenionally bar rooms)
 				if (pExistingStructure->fFlags & STRUCTURE_OPENABLE
-					&& !( gusTempDragBuildSoldierID != NOBODY && MercPtrs[gusTempDragBuildSoldierID]->sDragGridNo ) )
+					&& !( gusTempDragBuildSoldierID != NOBODY && gusTempDragBuildSoldierID->sDragGridNo ) )
 				{
 					// don't allow two openable structures in the same tile or things will screw
 					// up on an interface level