Browse Source

Check before SetEnemy in squad monster

hl_urbicide
Roman Chistokhodov 4 years ago committed by Andrey Akhmichin
parent
commit
7a999bf987
  1. 5
      dlls/squadmonster.cpp

5
dlls/squadmonster.cpp

@ -256,7 +256,10 @@ void CSquadMonster::SquadMakeEnemy( CBaseEntity *pEnemy )
if( pMember ) if( pMember )
{ {
// reset members who aren't activly engaged in fighting // reset members who aren't activly engaged in fighting
if( pMember->m_hEnemy != pEnemy && !pMember->HasConditions( bits_COND_SEE_ENEMY ) ) if( pMember->m_hEnemy != pEnemy && !pMember->HasConditions( bits_COND_SEE_ENEMY )
&& ( pMember->m_pSchedule && (pMember->m_pSchedule->iInterruptMask & bits_COND_NEW_ENEMY) )
// My enemy might be not an enemy for member of my squad, e.g. if I was provoked by player.
&& pMember->IRelationship(pEnemy) >= R_DL )
{ {
if( pMember->m_hEnemy != 0 ) if( pMember->m_hEnemy != 0 )
{ {

Loading…
Cancel
Save