From 80cf6af0ced061b8effe754fd0ace96457180419 Mon Sep 17 00:00:00 2001 From: Flugente Date: Sun, 9 Aug 2015 22:21:37 +0000 Subject: [PATCH] - Fix: opinion events on drinking alcohol did not happen - Fix: mercs in transit complain about mercs present in Arulco git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7965 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/DynamicDialogue.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Tactical/DynamicDialogue.cpp b/Tactical/DynamicDialogue.cpp index 5e70705d..5ee560fa 100644 --- a/Tactical/DynamicDialogue.cpp +++ b/Tactical/DynamicDialogue.cpp @@ -1675,6 +1675,10 @@ void CheckForFriendsofHated( SOLDIERTYPE* pSoldier ) SOLDIERTYPE* pOtherSoldier; SOLDIERTYPE* pThirdSoldier; + // make sure we ourselves aren't in transit + if ( !pSoldier->bActive || pSoldier->ubProfile == NO_PROFILE || pSoldier->bAssignment == IN_TRANSIT || pSoldier->bAssignment == ASSIGNMENT_DEAD ) + return; + bMercID = pSoldier->ubID; bLastTeamID = gTacticalStatus.Team[gbPlayerNum].bLastID; @@ -1833,7 +1837,7 @@ void HandleDynamicOpinionRetreat( ) void HandleDynamicOpinionTeamDrinking( SOLDIERTYPE* pSoldier ) { // need to be drunk for this - if ( !pSoldier || pSoldier->ubProfile == NO_PROFILE || !pSoldier->newdrugs.drinkstaken <= 0.0 ) + if ( !pSoldier || pSoldier->ubProfile == NO_PROFILE || pSoldier->newdrugs.drinkstaken <= 0.0 ) return; SOLDIERTYPE* pTeamSoldier = NULL;