This commit is contained in:
Charles 2001-08-02 16:26:54 +00:00
parent 8679995a69
commit 9bf66ef925
10 changed files with 115 additions and 26 deletions

View file

@ -535,7 +535,7 @@ void CNpcIronDogfishEnemy::collidedWith( CThing *_thisThing )
}
}
}
else if ( m_vulnerableTimer > 0 )
else if ( m_vulnerableTimer > 0 && m_invulnerableTimer <= 0 )
{
// player is attacking, respond appropriately