zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-07-11 15:20:22 +00:00
parent 994cbb07ca
commit 3d04467ef8
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Graphics/levels/Chapter02/Level04/Level04.MEX
View file

Binary file not shown.

BIN
Graphics/levels/Chapter02/Level04/level04.Mep
View file

Binary file not shown.

3
source/enemy/nsshark.cpp
View file

@ -765,6 +765,8 @@ void CNpcSubSharkEnemy::collidedWith(CThing *_thisThing)
ATTACK_STATE playerState = player->getAttackState(); ATTACK_STATE playerState = player->getAttackState();
if(playerState==ATTACK_STATE__NONE) if(playerState==ATTACK_STATE__NONE)
{
if ( !player->isRecoveringFromHit() )
{ {
CPlayer *player = GameScene.getPlayer(); CPlayer *player = GameScene.getPlayer();
@ -780,6 +782,7 @@ void CNpcSubSharkEnemy::collidedWith(CThing *_thisThing)
player->setMode( PLAYER_MODE_SWALLOW ); player->setMode( PLAYER_MODE_SWALLOW );
} }
} }
}
else if ( m_invulnerableTimer <= 0 ) else if ( m_invulnerableTimer <= 0 )
{ {
// player is attacking, respond appropriately // player is attacking, respond appropriately