From b1233990d8c06216373175e92f7d27d70035b3c0 Mon Sep 17 00:00:00 2001 From: Shadooow Date: Sun, 23 May 2021 20:55:10 +0000 Subject: [PATCH] fix: vehicles will also not count into number of mercenenaries died under player command git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9039 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Strategic Merc Handler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Strategic/Strategic Merc Handler.cpp b/Strategic/Strategic Merc Handler.cpp index aa568a168..6e131a770 100644 --- a/Strategic/Strategic Merc Handler.cpp +++ b/Strategic/Strategic Merc Handler.cpp @@ -115,8 +115,8 @@ void StrategicHandlePlayerTeamMercDeath( SOLDIERTYPE *pSoldier ) } } - // robot and EPCs don't count against death rate - the mercs back home don't particularly give a damn about locals & machines! - if ( !AM_AN_EPC( pSoldier ) && !AM_A_ROBOT( pSoldier ) ) + // robot, vehicles and EPCs don't count against death rate - the mercs back home don't particularly give a damn about locals & machines! + if ( !AM_AN_EPC( pSoldier ) && !AM_A_ROBOT( pSoldier ) && !(pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE)) { // keep track of how many mercs have died under player's command (for death rate, can't wait until removed from team) gStrategicStatus.ubMercDeaths++;