From 71d85d8bb5b2a547784a1bb2412b2cfcb852d3f9 Mon Sep 17 00:00:00 2001 From: Flugente Date: Sat, 22 Feb 2014 19:02:26 +0000 Subject: [PATCH] Fix: soldiers without a face index should not use Character Dialogue that uses face index git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6963 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Dialogue Control.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Tactical/Dialogue Control.cpp b/Tactical/Dialogue Control.cpp index 47d99f7c..813eb281 100644 --- a/Tactical/Dialogue Control.cpp +++ b/Tactical/Dialogue Control.cpp @@ -1631,6 +1631,10 @@ BOOLEAN TacticalCharacterDialogue( SOLDIERTYPE *pSoldier, UINT16 usQuoteNum ) } } + // Flugente: if we don't have a face index, then don't do a dialogue here... + if ( pSoldier->iFaceIndex <= -1 ) + return( FALSE ); + return( CharacterDialogue( pSoldier->ubProfile, usQuoteNum, pSoldier->iFaceIndex, DIALOGUE_TACTICAL_UI, TRUE, FALSE ) ); }