From 4266ba809d7de4fd43513035d8f9e35fd3438db8 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 11 Aug 2013 19:02:00 +0000
Subject: [PATCH] - Bugfix: Prevent merc swapping in tactical while they are
 talking (by silversurfer)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6281 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Turn Based Input.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp
index de573215..dee68bf0 100644
--- a/Tactical/Turn Based Input.cpp	
+++ b/Tactical/Turn Based Input.cpp	
@@ -264,6 +264,7 @@ void	CheatCreateItem();
 // silversurfer: added for merc portrait swapping in tactical
 void	SwapMercPortraits ( SOLDIERTYPE *pSoldier, INT8 bDirection );
 extern	INT8 GetTeamSlotFromPlayerID( UINT8 ubID );
+extern FACETYPE	*gpCurrentTalkingFace;
 
 void	GetTBMouseButtonInput( UINT32 *puiNewEvent )
 {
@@ -7178,6 +7179,10 @@ void SwapMercPortraits ( SOLDIERTYPE *pSoldier, INT8 bDirection )
 	if ( gsCurInterfacePanel != TEAM_PANEL )
 		return;
 
+	// if someone is talking don't swap!
+	if ( gpCurrentTalkingFace != NULL )
+		return;
+
 	UINT8 ubSourceMerc = gusSelectedSoldier;
 	UINT8 ubTargetMerc;
 	UINT8 ubGroupID = pSoldier->ubGroupID;