From 1b39535b150f5be7db9e0e2b535a27b3fde0c717 Mon Sep 17 00:00:00 2001 From: Flugente Date: Wed, 11 Jan 2017 23:26:30 +0000 Subject: [PATCH] Fix: during retreat, mercs got a morale penalty for being a pacifist, instead of getting it unless they are pacifist git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8360 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Morale.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tactical/Morale.cpp b/Tactical/Morale.cpp index 75d58bad8..f0c2707b8 100644 --- a/Tactical/Morale.cpp +++ b/Tactical/Morale.cpp @@ -789,7 +789,7 @@ void HandleMoraleEvent( SOLDIERTYPE *pSoldier, INT8 bMoraleEvent, INT16 sMapX, I if ( !HAS_SKILL_TRAIT( pTeamSoldier, COVERT_NT ) || ( (pTeamSoldier->usSoldierFlagMask & (SOLDIER_COVERT_CIV|SOLDIER_COVERT_SOLDIER)) == 0) ) { // SANDRO - no penalty for pacifists to run away - if ( DoesMercHavePersonality( pTeamSoldier, CHAR_TRAIT_PACIFIST ) ) + if ( !DoesMercHavePersonality( pTeamSoldier, CHAR_TRAIT_PACIFIST ) ) HandleMoraleEventForSoldier( pTeamSoldier, MORALE_RAN_AWAY ); // Double morale drop for aggressive people