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.

23
source/enemy/nsshark.cpp
View file

@ -766,18 +766,21 @@ void CNpcSubSharkEnemy::collidedWith(CThing *_thisThing)
if(playerState==ATTACK_STATE__NONE) if(playerState==ATTACK_STATE__NONE)
{ {
CPlayer *player = GameScene.getPlayer(); if ( !player->isRecoveringFromHit() )
if ( !player->isRecoveringFromHit() && !m_carryPlayer )
{ {
player->takeDamage( m_data[m_type].damageToUserType,REACT__GET_DIRECTION_FROM_THING,(CThing*)this ); CPlayer *player = GameScene.getPlayer();
}
if ( m_state == SUB_SHARK_CHARGE && player->getMode() != PLAYER_MODE_SWALLOW ) if ( !player->isRecoveringFromHit() && !m_carryPlayer )
{ {
m_carryPlayer = true; player->takeDamage( m_data[m_type].damageToUserType,REACT__GET_DIRECTION_FROM_THING,(CThing*)this );
m_oldPlayerMode = player->getMode(); }
player->setMode( PLAYER_MODE_SWALLOW );
if ( m_state == SUB_SHARK_CHARGE && player->getMode() != PLAYER_MODE_SWALLOW )
{
m_carryPlayer = true;
m_oldPlayerMode = player->getMode();
player->setMode( PLAYER_MODE_SWALLOW );
}
} }
} }
else if ( m_invulnerableTimer <= 0 ) else if ( m_invulnerableTimer <= 0 )