1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed autobandaging showing up during conversation which caused numerous issues

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9169 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Shadooow
2021-09-24 02:10:48 +00:00
parent 566f8ab5d4
commit 20335041f7
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Auto Bandage.cpp
+2 -2
View File
@@ -53,7 +53,7 @@ BOOLEAN gfAutoBandageFailed;
INT32 iEndAutoBandageButton[ 2 ]; INT32 iEndAutoBandageButton[ 2 ];
INT32 iEndAutoBandageButtonImage[ 2 ]; INT32 iEndAutoBandageButtonImage[ 2 ];
extern BOOLEAN gfConversationPending;
extern FACETYPE *gpCurrentTalkingFace; extern FACETYPE *gpCurrentTalkingFace;
extern INT32 giMercPanelImage; extern INT32 giMercPanelImage;
MOUSE_REGION gAutoBandageRegion; MOUSE_REGION gAutoBandageRegion;
@@ -168,7 +168,7 @@ void HandleAutoBandagePending( )
{ {
// All dailogue done, music, etc... // All dailogue done, music, etc...
//if ( gubMusicMode != MUSIC_TACTICAL_VICTORY && DialogueQueueIsEmpty( ) ) //if ( gubMusicMode != MUSIC_TACTICAL_VICTORY && DialogueQueueIsEmpty( ) )
if ( !DialogueQueueIsEmpty( ) ) if (!DialogueQueueIsEmpty( ) || gfConversationPending)
{ {
return; return;
} }
Tactical/Turn Based Input.cpp
+4 -1
View File
@@ -3165,7 +3165,10 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
} }
else else
{ {
BeginAutoBandage( ); if (DialogueQueueIsEmpty())//shadooow: trying to use autobandage during conversation will mess up game
{
BeginAutoBandage();
}
} }
break; break;