Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-07-16 14:19:10 +00:00
parent fd5ed94bae
commit 911c868e99
4 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/enemy/nmjfish.cpp
View File

@ -778,7 +778,7 @@ void CNpcMotherJellyfishEnemy::processShot( int _frames )
{ {
case NPC_GENERIC_HIT_CHECK_HEALTH: case NPC_GENERIC_HIT_CHECK_HEALTH:
{ {
if ( m_health > 0 ) if ( m_health > 5 )
{ {
m_health -= 5; m_health -= 5;
@ -790,6 +790,7 @@ void CNpcMotherJellyfishEnemy::processShot( int _frames )
} }
else else
{ {
m_health = 0;
m_state = MOTHER_JELLYFISH_BEGIN_CIRCLE; m_state = MOTHER_JELLYFISH_BEGIN_CIRCLE;
} }

17
source/enemy/npc.cpp
View File

@ -220,13 +220,23 @@ CNpcEnemy *CNpcEnemy::Create(int enemyType)
{ {
case CNpcEnemy::NPC_MOTHER_JELLYFISH: case CNpcEnemy::NPC_MOTHER_JELLYFISH:
case CNpcEnemy::NPC_SUB_SHARK: case CNpcEnemy::NPC_SUB_SHARK:
case CNpcEnemy::NPC_SEA_SNAKE:
case CNpcEnemy::NPC_FLYING_DUTCHMAN: case CNpcEnemy::NPC_FLYING_DUTCHMAN:
case CNpcEnemy::NPC_IRON_DOGFISH: case CNpcEnemy::NPC_IRON_DOGFISH:
{ {
if ( CLevel::getIsBossRespawn() ) if ( CLevel::getIsBossRespawn() )
{ {
if ( !CLevel::getBossHealth() ) if ( CLevel::getBossHealth() <= 0 )
{
return( NULL );
}
}
}
case CNpcEnemy::NPC_SEA_SNAKE:
{
if ( CLevel::getIsBossRespawn() )
{
if ( CLevel::getBossHealth() < 0 )
{ {
return( NULL ); return( NULL );
} }
@ -1191,10 +1201,11 @@ void CNpcEnemy::processShot( int _frames )
{ {
m_health -= 5; m_health -= 5;
if ( m_health < 0 ) if ( m_health <= 0 )
{ {
m_state = NPC_GENERIC_HIT_DEATH_START; m_state = NPC_GENERIC_HIT_DEATH_START;
m_isDying = true; m_isDying = true;
m_health = 0;
} }
else else
{ {

2
source/enemy/nsshark.cpp
View File

@ -680,7 +680,7 @@ void CNpcSubSharkEnemy::processShot( int _frames )
{ {
m_health -= 5; m_health -= 5;
if ( m_health < 0 ) if ( m_health <= 0 )
{ {
m_state = NPC_GENERIC_HIT_DEATH_START; m_state = NPC_GENERIC_HIT_DEATH_START;
m_isDying = true; m_isDying = true;

9
source/enemy/nssnake.cpp
View File

@ -187,7 +187,7 @@ void CNpcSeaSnakeEnemy::shutdown()
} }
else else
{ {
CLevel::setBossHealth( 0 ); CLevel::setBossHealth( -1 );
} }
// delete snake segments // delete snake segments
@ -1056,6 +1056,8 @@ int CNpcSeaSnakeSegment::checkCollisionAgainst( CThing *_thisThing, int _frames
void CNpcSeaSnakeEnemy::processShot( int _frames ) void CNpcSeaSnakeEnemy::processShot( int _frames )
{ {
if ( !m_segmentCount ) if ( !m_segmentCount )
{
if ( m_collTimer <= 0 )
{ {
m_drawRotation += 64 * _frames; m_drawRotation += 64 * _frames;
m_drawRotation &= 4095; m_drawRotation &= 4095;
@ -1078,6 +1080,11 @@ void CNpcSeaSnakeEnemy::processShot( int _frames )
} }
} }
else else
{
m_controlFunc = NPC_CONTROL_MOVEMENT;
}
}
else
{ {
if ( m_collTimer <= 0 ) if ( m_collTimer <= 0 )
{ {