mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
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
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user