From a48bd9a8a07c8e4481290cae4d3e9bf66c01fff9 Mon Sep 17 00:00:00 2001 From: Flugente Date: Tue, 2 Jun 2020 18:37:18 +0000 Subject: [PATCH] Fix: previous fix excluded non-RPCs from dialogue replacement git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8818 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Dialogue Control.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tactical/Dialogue Control.cpp b/Tactical/Dialogue Control.cpp index 6cbc9c02..f9eb537f 100644 --- a/Tactical/Dialogue Control.cpp +++ b/Tactical/Dialogue Control.cpp @@ -2156,7 +2156,8 @@ BOOLEAN ExecuteCharacterDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, INT32 // Flugente: hijack the quote for possible replacement by additional dialogue // only do so if recruited (npc dialogue is already unique) - if ( gMercProfiles[ubCharacterNum].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED ) + if ( ( gMercProfiles[ubCharacterNum].Type != PROFILETYPE_RPC && gMercProfiles[ubCharacterNum].Type != PROFILETYPE_NPC ) + || ( gMercProfiles[ubCharacterNum].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED ) ) LuaHandleReplaceQuote( ubCharacterNum, usQuoteNum ); // sevenfm: stop high speed timer for any talking face