1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: soldier alert status was not set correctly (by sevenfm)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8465 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-08-29 17:57:16 +00:00
parent 49ca74848f
commit edbee58ca7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+6 -6
View File
@@ -16032,8 +16032,8 @@ BOOLEAN SOLDIERTYPE::FreePrisoner( )
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szPrisonerTextStr[STR_PRISONER_X_FREES_Y], this->GetName( ), pSoldier->GetName( ) ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szPrisonerTextStr[STR_PRISONER_X_FREES_Y], this->GetName( ), pSoldier->GetName( ) );
// alert both soldiers // alert both soldiers
this->aiData.bAlertStatus = min( this->aiData.bAlertStatus, STATUS_RED ); this->aiData.bAlertStatus = max( this->aiData.bAlertStatus, STATUS_RED );
pSoldier->aiData.bAlertStatus = min( pSoldier->aiData.bAlertStatus, STATUS_RED ); pSoldier->aiData.bAlertStatus = max( pSoldier->aiData.bAlertStatus, STATUS_RED );
return TRUE; return TRUE;
} }
@@ -18426,8 +18426,8 @@ BOOLEAN SOLDIERTYPE::AIDoctorFriend( )
pSoldier->sDamage -= pSoldier->stats.bLife - oldlife; pSoldier->sDamage -= pSoldier->stats.bLife - oldlife;
// alert both soldiers // alert both soldiers
this->aiData.bAlertStatus = min( this->aiData.bAlertStatus, STATUS_RED ); this->aiData.bAlertStatus = max( this->aiData.bAlertStatus, STATUS_RED );
pSoldier->aiData.bAlertStatus = min( pSoldier->aiData.bAlertStatus, STATUS_RED ); pSoldier->aiData.bAlertStatus = max( pSoldier->aiData.bAlertStatus, STATUS_RED );
return TRUE; return TRUE;
} }
@@ -18471,7 +18471,7 @@ BOOLEAN SOLDIERTYPE::AIDoctorSelf( )
this->sDamage -= this->stats.bLife - oldlife; this->sDamage -= this->stats.bLife - oldlife;
// alert ourself // alert ourself
this->aiData.bAlertStatus = min( this->aiData.bAlertStatus, STATUS_RED ); this->aiData.bAlertStatus = max( this->aiData.bAlertStatus, STATUS_RED );
return TRUE; 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() ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szCovertTextStr[STR_COVERT_UNCOVERED], pSoldier->GetName(), this->GetName() );
// alert the soldier // 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 ); ProcessImplicationsOfPCAttack( this, &pSoldier, REASON_NORMAL_ATTACK );
} }