From 20335041f7e053dee4f5e07ead79317600de1043 Mon Sep 17 00:00:00 2001
From: Shadooow <Shadooow@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Fri, 24 Sep 2021 02:10:48 +0000
Subject: [PATCH] fixed autobandaging showing up during conversation which
 caused numerous issues

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9169 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Auto Bandage.cpp     | 4 ++--
 Tactical/Turn Based Input.cpp | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Tactical/Auto Bandage.cpp b/Tactical/Auto Bandage.cpp
index cc481b50..b254fb02 100644
--- a/Tactical/Auto Bandage.cpp	
+++ b/Tactical/Auto Bandage.cpp	
@@ -53,7 +53,7 @@ BOOLEAN gfAutoBandageFailed;
 INT32 iEndAutoBandageButton[ 2 ];
 INT32 iEndAutoBandageButtonImage[ 2 ];
 
-
+extern BOOLEAN gfConversationPending;
 extern FACETYPE *gpCurrentTalkingFace;
 extern INT32 giMercPanelImage;
 MOUSE_REGION gAutoBandageRegion;
@@ -168,7 +168,7 @@ void HandleAutoBandagePending( )
 	{
 		// All dailogue done, music, etc...
 		//if ( gubMusicMode != MUSIC_TACTICAL_VICTORY && DialogueQueueIsEmpty( ) )
-		if ( !DialogueQueueIsEmpty( ) )
+		if (!DialogueQueueIsEmpty( ) || gfConversationPending)
 		{
 			return;
 		}
diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp
index c6b27fde..bc84d9bb 100644
--- a/Tactical/Turn Based Input.cpp	
+++ b/Tactical/Turn Based Input.cpp	
@@ -3165,7 +3165,10 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 				}
 				else
 				{
-					BeginAutoBandage( );
+					if (DialogueQueueIsEmpty())//shadooow: trying to use autobandage during conversation will mess up game
+					{
+						BeginAutoBandage();
+					}
 				}
 				break;