Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-07-19 14:49:35 +00:00
parent 6346c24284
commit a6648b8d5e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/enemy/nsshark.cpp
View File

@ -806,7 +806,9 @@ void CNpcSubSharkEnemy::collidedWith(CThing *_thisThing)
player->takeDamage( m_data[m_type].damageToUserType,REACT__GET_DIRECTION_FROM_THING,(CThing*)this ); player->takeDamage( m_data[m_type].damageToUserType,REACT__GET_DIRECTION_FROM_THING,(CThing*)this );
} }
if ( m_state == SUB_SHARK_CHARGE && player->getMode() != PLAYER_MODE_SWALLOW ) if ( m_state == SUB_SHARK_CHARGE &&
player->getMode() != PLAYER_MODE_SWALLOW &&
player->getMode() != PLAYER_MODE_DEAD )
{ {
m_carryPlayer = true; m_carryPlayer = true;
m_oldPlayerMode = player->getMode(); m_oldPlayerMode = player->getMode();