1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: previous fix excluded non-RPCs from dialogue replacement

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8818 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2020-06-02 18:37:18 +00:00
parent d5d4db6066
commit a48bd9a8a0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Dialogue Control.cpp
+2 -1
View File
@@ -2156,7 +2156,8 @@ BOOLEAN ExecuteCharacterDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, INT32
// Flugente: hijack the quote for possible replacement by additional dialogue // Flugente: hijack the quote for possible replacement by additional dialogue
// only do so if recruited (npc dialogue is already unique) // 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 ); LuaHandleReplaceQuote( ubCharacterNum, usQuoteNum );
// sevenfm: stop high speed timer for any talking face // sevenfm: stop high speed timer for any talking face