From 5d81b61f8e8183bba34c1cf40056eb36e0f81f54 Mon Sep 17 00:00:00 2001 From: Shadooow Date: Fri, 21 May 2021 14:01:40 +0000 Subject: [PATCH] fix for "white face" when saying some quote which happened when the soldier was bleeding in different sector than we are in right now git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9035 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Soldier Control.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index 77b2b7986..97e54c4b8 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -23735,11 +23735,14 @@ void SOLDIERTYPE::HandleSoldierTakeDamageFeedback( void ) this->DoMercBattleSound( BATTLE_SOUND_HIT1 ); } } - - // Flash portrait.... - this->flags.fFlashPortrait = TRUE; - this->bFlashPortraitFrame = FLASH_PORTRAIT_STARTSHADE; - RESETTIMECOUNTER( this->timeCounters.PortraitFlashCounter, FLASH_PORTRAIT_DELAY ); + // shadooow: Do this ONLY if buddy is in sector..... + if ((this->bInSector && guiCurrentScreen == GAME_SCREEN) || guiCurrentScreen != GAME_SCREEN) + { + // Flash portrait.... + this->flags.fFlashPortrait = TRUE; + this->bFlashPortraitFrame = FLASH_PORTRAIT_STARTSHADE; + RESETTIMECOUNTER(this->timeCounters.PortraitFlashCounter, FLASH_PORTRAIT_DELAY); + } }