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-02 20:19:22 +00:00
parent 938ba358b6
commit 6109bffb6d
3 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
source/enemy/nfdutch.cpp
View file

@ -237,7 +237,7 @@ void CNpcFlyingDutchmanEnemy::processClose( int _frames )
newPos.vy -= 50;
projectile->init( newPos, heading );
projectile->setGraphic( FRM__SNAKEBILE );
projectile->setSpeed( 5 );
projectile->setSpeed( 6 );
m_fireCount++;
@ -315,11 +315,14 @@ void CNpcFlyingDutchmanEnemy::processClose( int _frames )
void CNpcFlyingDutchmanEnemy::processShotDeathEnd( int _frames )
{
CNpcEnemy::processShotDeathEnd( _frames );
if ( isSetToShutdown() )
if ( !m_animPlaying )
{
CGameScene::setBossHasBeenKilled();
CNpcEnemy::processShotDeathEnd( _frames );
if ( isSetToShutdown() )
{
CGameScene::setBossHasBeenKilled();
}
}
}
@ -423,7 +426,7 @@ void CNpcFlyingDutchmanEnemy::collidedWith(CThing *_thisThing)
drawAttackEffect();
m_invulnerableTimer = 2 * GameState::getOneSecondInFrames();
m_invulnerableTimer = 4 * GameState::getOneSecondInFrames();
}
}
@ -457,7 +460,7 @@ u8 CNpcFlyingDutchmanEnemy::hasBeenAttacked()
{
if ( m_controlFunc != NPC_CONTROL_SHOT )
{
m_invulnerableTimer = 2 * GameState::getOneSecondInFrames();
m_invulnerableTimer = 4 * GameState::getOneSecondInFrames();
m_controlFunc = NPC_CONTROL_SHOT;
m_state = NPC_GENERIC_HIT_CHECK_HEALTH;