Check before SetEnemy in squad monster

SerenityPorts · Jun 5, 2021 · 7a999bf · 7a999bf
1 parent 2c9cb0c
commit 7a999bf
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/dlls/squadmonster.cpp b/dlls/squadmonster.cpp
@@ -256,7 +256,10 @@ void CSquadMonster::SquadMakeEnemy( CBaseEntity *pEnemy )
  if( pMember )
  {
  // 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 )
  {