This commit is contained in:
parent
10a01720c7
commit
8259aac172
1 changed files with 42 additions and 39 deletions
|
@ -1251,6 +1251,8 @@ void CNpcSeaSnakeEnemy::collidedWith( CThing *_thisThing )
|
||||||
switch(_thisThing->getThingType())
|
switch(_thisThing->getThingType())
|
||||||
{
|
{
|
||||||
case TYPE_PLAYER:
|
case TYPE_PLAYER:
|
||||||
|
{
|
||||||
|
if ( m_invulnerableTimer <= 0 )
|
||||||
{
|
{
|
||||||
CPlayer *player = (CPlayer *) _thisThing;
|
CPlayer *player = (CPlayer *) _thisThing;
|
||||||
|
|
||||||
|
@ -1292,7 +1294,7 @@ void CNpcSeaSnakeEnemy::collidedWith( CThing *_thisThing )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ( m_invulnerableTimer <= 0 )
|
else
|
||||||
{
|
{
|
||||||
// player is attacking, respond appropriately
|
// player is attacking, respond appropriately
|
||||||
|
|
||||||
|
@ -1308,6 +1310,7 @@ void CNpcSeaSnakeEnemy::collidedWith( CThing *_thisThing )
|
||||||
drawAttackEffect();
|
drawAttackEffect();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue