From 2b63a5b5688b52913d0ea10dfb25a58c830184bd Mon Sep 17 00:00:00 2001 From: Flugente Date: Tue, 8 Jul 2014 19:00:24 +0000 Subject: [PATCH] Fix: mercs got opinion events on themselves. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7315 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/DynamicDialogue.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Tactical/DynamicDialogue.cpp b/Tactical/DynamicDialogue.cpp index 6a2f1196..54fee457 100644 --- a/Tactical/DynamicDialogue.cpp +++ b/Tactical/DynamicDialogue.cpp @@ -1151,7 +1151,10 @@ void SetfDynamicOpinionSpeechInProgress( BOOLEAN aVal ) void AddOpinionEvent( UINT8 usProfileA, UINT8 usProfileB, UINT8 usEvent, BOOLEAN fStartDialogue ) { - if ( usProfileA == NO_PROFILE || usProfileA == NO_PROFILE ) + if ( usProfileA == NO_PROFILE || usProfileB == NO_PROFILE ) + return; + + if ( usProfileA == usProfileB ) return; if ( usEvent >= OPINIONEVENT_MAX )