From a3bcfef40a2e49c7ae3455d60b7ccc189f99ce52 Mon Sep 17 00:00:00 2001 From: Shadooow Date: Sun, 17 Oct 2021 23:16:52 +0000 Subject: [PATCH] maximum heath of merc on mapscreen will now show in red color if the merc suffered a health loss from critical hit git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9187 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/mapscreen.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index 97bb3a93..d531e448 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -2721,8 +2721,11 @@ void DrawCharHealth( INT16 sCharNum ) DrawString( sString, usX, CHAR_HP_Y, CHAR_FONT ); usX += StringPixLength( sString, CHAR_FONT ); - - if( ( GetJA2Clock() < CHANGE_STAT_RECENTLY_DURATION + pSoldier->timeChanges.uiChangeHealthTime)&& ( pSoldier->timeChanges.uiChangeHealthTime != 0 ) ) + if (gGameOptions.fNewTraitSystem && pSoldier->ubCriticalStatDamage[DAMAGED_STAT_HEALTH] > 0) + { + SetFontForeground(FONT_RED); + } + else if( ( GetJA2Clock() < CHANGE_STAT_RECENTLY_DURATION + pSoldier->timeChanges.uiChangeHealthTime)&& ( pSoldier->timeChanges.uiChangeHealthTime != 0 ) ) { if( pSoldier->usValueGoneUp & HEALTH_INCREASE ) {