This commit is contained in:
Charles 2001-02-09 19:44:36 +00:00
parent 13d1c9f499
commit f19b381fad
4 changed files with 43 additions and 2 deletions

View file

@ -54,7 +54,7 @@ s32 CNpc::playerYDistSqr;
void CNpc::init()
{
m_type = NPC_ANEMONE_3;
m_type = NPC_FLAMING_SKULL;
m_heading = m_fireHeading = 0;
m_movementTimer = 0;
@ -339,7 +339,7 @@ void CNpc::think(int _frames)
void CNpc::detectCollisionWithPlayer()
{
if ( playerXDistSqr + playerYDistSqr < 400 )
if ( m_data[m_type].detectCollision && playerXDistSqr + playerYDistSqr < 400 )
{
// close enough for collision