From d5d4db6066d508bd21bd5e6b8236cda524e50bf5 Mon Sep 17 00:00:00 2001 From: Flugente Date: Tue, 2 Jun 2020 17:27:20 +0000 Subject: [PATCH] Fix: do not call lua dialogue replacement function for RPCs git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8817 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Dialogue Control.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Tactical/Dialogue Control.cpp b/Tactical/Dialogue Control.cpp index 80575753..6cbc9c02 100644 --- a/Tactical/Dialogue Control.cpp +++ b/Tactical/Dialogue Control.cpp @@ -210,6 +210,7 @@ extern BOOLEAN ContinueDialogue(SOLDIERTYPE *pSoldier, BOOLEAN fDone ); extern void HandlePendingInitConv( ); extern BOOLEAN WillMercRenew( SOLDIERTYPE *pSoldier, BOOLEAN fSayQuote ); extern void DrawFace( INT16 sCharNumber ); +extern void LuaHandleReplaceQuote( UINT8 ubProfile, UINT16 usQuoteNum ); // the next said quote will pause time BOOLEAN fPausedTimeDuringQuote = FALSE; @@ -2154,9 +2155,9 @@ BOOLEAN ExecuteCharacterDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, INT32 } // Flugente: hijack the quote for possible replacement by additional dialogue - extern void LuaHandleReplaceQuote( UINT8 ubProfile, UINT16 usQuoteNum ); - - LuaHandleReplaceQuote( ubCharacterNum, usQuoteNum ); + // only do so if recruited (npc dialogue is already unique) + if ( gMercProfiles[ubCharacterNum].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED ) + LuaHandleReplaceQuote( ubCharacterNum, usQuoteNum ); // sevenfm: stop high speed timer for any talking face if (IsFastForwardMode())