From ecb29ae9bc80b774ea43508bf715c66c061282f1 Mon Sep 17 00:00:00 2001
From: Asdow <20314541+Asdow@users.noreply.github.com>
Date: Fri, 15 Nov 2024 21:09:17 +0200
Subject: [PATCH] Convert SOLDIERTYPE->usChatPartnerID to SoldierID

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

diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp
index ea6775cc8..3d10915fd 100644
--- a/Tactical/Overhead.cpp
+++ b/Tactical/Overhead.cpp
@@ -11397,7 +11397,7 @@ void CheckChatPartners()
 					if ( fMercQuoteThisTime )
 						GetSoldierScreenPos( pSoldier, &sScreenX, &sScreenY );
 					else
-						GetSoldierScreenPos( MercPtrs[pSoldier->usChatPartnerID], &sScreenX, &sScreenY );
+						GetSoldierScreenPos( pSoldier->usChatPartnerID, &sScreenX, &sScreenY );
 
 					if ( gsVIEWPORT_START_X <= sScreenX &&
 						gsVIEWPORT_END_X >= sScreenX &&
@@ -11407,7 +11407,7 @@ void CheckChatPartners()
 						if ( fMercQuoteThisTime )
 							BeginChatQuote( pSoldier, sScreenX, sScreenY );
 						else
-							BeginChatQuote( MercPtrs[pSoldier->usChatPartnerID], sScreenX, sScreenY );
+							BeginChatQuote( pSoldier->usChatPartnerID, sScreenX, sScreenY );
 
 						fMercQuoteThisTime = !fMercQuoteThisTime;
 
diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp
index 595994bbe..78ba39b64 100644
--- a/Tactical/Soldier Control.cpp	
+++ b/Tactical/Soldier Control.cpp	
@@ -21010,7 +21010,7 @@ void		SOLDIERTYPE::StopChatting()
 {
 	if ( this->usChatPartnerID != NOBODY )
 	{
-		ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, TacticalStr[DISTRACT_STOP_STR], this->GetName(), MercPtrs[this->usChatPartnerID]->GetName() );
+		ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, TacticalStr[DISTRACT_STOP_STR], this->GetName(), this->usChatPartnerID->GetName() );
 
 		MercPtrs[this->usChatPartnerID]->usChatPartnerID = NOBODY;
 		this->usChatPartnerID = NOBODY;
diff --git a/Tactical/Soldier Control.h b/Tactical/Soldier Control.h
index 81dc88bc6..d28bb6985 100644
--- a/Tactical/Soldier Control.h	
+++ b/Tactical/Soldier Control.h	
@@ -1550,7 +1550,7 @@ public:
 	//INT16	bUnusedINT16_4;
 	INT16	sDragCorpseID;			// Flugente: id of corpse we are dragging
 
-	UINT16	usChatPartnerID;		// Flugente: the id of another merc we are 'chatting' with
+	SoldierID	usChatPartnerID;		// Flugente: the id of another merc we are 'chatting' with
 	
 	// Flugente: new variables for extra stats	
 	INT16	bExtraStrength;			// additional strength gained via power armor