|
|
@ -2285,9 +2285,7 @@ int CHFGrunt :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, flo |
|
|
|
if( m_hEnemy == 0 ) |
|
|
|
if( m_hEnemy == 0 ) |
|
|
|
{ |
|
|
|
{ |
|
|
|
// If the player was facing directly at me, or I'm already suspicious, get mad
|
|
|
|
// If the player was facing directly at me, or I'm already suspicious, get mad
|
|
|
|
if( ( m_afMemory & bits_MEMORY_SUSPICIOUS ) || IsFacing( pevAttacker, pev->origin ) ) |
|
|
|
if( (( m_afMemory & bits_MEMORY_SUSPICIOUS ) || IsFacing( pevAttacker, pev->origin )) && gpGlobals->time - m_flLastHitByPlayer < 4.0 && m_iPlayerHits >= 3 ) |
|
|
|
{ |
|
|
|
|
|
|
|
if (gpGlobals->time - m_flLastHitByPlayer < 4.0 && m_iPlayerHits >= 3) |
|
|
|
|
|
|
|
{ |
|
|
|
{ |
|
|
|
// Alright, now I'm pissed!
|
|
|
|
// Alright, now I'm pissed!
|
|
|
|
PlaySentence( "FG_MAD", 4, VOL_NORM, ATTN_NORM ); |
|
|
|
PlaySentence( "FG_MAD", 4, VOL_NORM, ATTN_NORM ); |
|
|
@ -2295,7 +2293,6 @@ int CHFGrunt :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, flo |
|
|
|
Remember( bits_MEMORY_PROVOKED ); |
|
|
|
Remember( bits_MEMORY_PROVOKED ); |
|
|
|
StopFollowing( TRUE ); |
|
|
|
StopFollowing( TRUE ); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
else |
|
|
|
else |
|
|
|
{ |
|
|
|
{ |
|
|
|
if ( gpGlobals->time - m_flLastHitByPlayer >= 4.0 ) |
|
|
|
if ( gpGlobals->time - m_flLastHitByPlayer >= 4.0 ) |
|
|
|