From edbee58ca717f1b40b1eea974a879856f291a87d Mon Sep 17 00:00:00 2001 From: Flugente Date: Tue, 29 Aug 2017 17:57:16 +0000 Subject: [PATCH] Fix: soldier alert status was not set correctly (by sevenfm) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8465 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Soldier Control.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index e9ae3262..f1e73b15 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -16032,8 +16032,8 @@ BOOLEAN SOLDIERTYPE::FreePrisoner( ) ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szPrisonerTextStr[STR_PRISONER_X_FREES_Y], this->GetName( ), pSoldier->GetName( ) ); // alert both soldiers - this->aiData.bAlertStatus = min( this->aiData.bAlertStatus, STATUS_RED ); - pSoldier->aiData.bAlertStatus = min( pSoldier->aiData.bAlertStatus, STATUS_RED ); + this->aiData.bAlertStatus = max( this->aiData.bAlertStatus, STATUS_RED ); + pSoldier->aiData.bAlertStatus = max( pSoldier->aiData.bAlertStatus, STATUS_RED ); return TRUE; } @@ -18426,8 +18426,8 @@ BOOLEAN SOLDIERTYPE::AIDoctorFriend( ) pSoldier->sDamage -= pSoldier->stats.bLife - oldlife; // alert both soldiers - this->aiData.bAlertStatus = min( this->aiData.bAlertStatus, STATUS_RED ); - pSoldier->aiData.bAlertStatus = min( pSoldier->aiData.bAlertStatus, STATUS_RED ); + this->aiData.bAlertStatus = max( this->aiData.bAlertStatus, STATUS_RED ); + pSoldier->aiData.bAlertStatus = max( pSoldier->aiData.bAlertStatus, STATUS_RED ); return TRUE; } @@ -18471,7 +18471,7 @@ BOOLEAN SOLDIERTYPE::AIDoctorSelf( ) this->sDamage -= this->stats.bLife - oldlife; // alert ourself - this->aiData.bAlertStatus = min( this->aiData.bAlertStatus, STATUS_RED ); + this->aiData.bAlertStatus = max( this->aiData.bAlertStatus, STATUS_RED ); return TRUE; } @@ -20313,7 +20313,7 @@ void SOLDIERTYPE::EVENT_SoldierHandcuffPerson( INT32 sGridNo, UINT8 ubDirection ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szCovertTextStr[STR_COVERT_UNCOVERED], pSoldier->GetName(), this->GetName() ); // alert the soldier - pSoldier->aiData.bAlertStatus = min( pSoldier->aiData.bAlertStatus, STATUS_RED ); + pSoldier->aiData.bAlertStatus = max( pSoldier->aiData.bAlertStatus, STATUS_RED ); ProcessImplicationsOfPCAttack( this, &pSoldier, REASON_NORMAL_ATTACK ); }