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;