From c6a63413e6c7355923a14c0c8ad879f4a5da70e4 Mon Sep 17 00:00:00 2001 From: Charles Date: Sat, 18 Aug 2001 18:14:15 +0000 Subject: [PATCH] --- source/enemy/nboss.cpp | 1 + source/enemy/ndogfish.cpp | 5 ----- source/enemy/nfdutch.cpp | 5 ----- source/enemy/nsshark.cpp | 6 +----- source/enemy/nssnake.cpp | 1 - 5 files changed, 2 insertions(+), 16 deletions(-) diff --git a/source/enemy/nboss.cpp b/source/enemy/nboss.cpp index 6130c9848..c9d168de9 100644 --- a/source/enemy/nboss.cpp +++ b/source/enemy/nboss.cpp @@ -92,6 +92,7 @@ void CNpcBossEnemy::processShot( int _frames ) m_state = NPC_GENERIC_HIT_DEATH_START; m_isDying = true; m_health = 0; + CGameScene::setBossHasBeenKilled(); } else { diff --git a/source/enemy/ndogfish.cpp b/source/enemy/ndogfish.cpp index 234ddebb9..61921ffe4 100644 --- a/source/enemy/ndogfish.cpp +++ b/source/enemy/ndogfish.cpp @@ -480,11 +480,6 @@ void CNpcIronDogfishEnemy::processShotDeathEnd( int _frames ) if ( !m_animPlaying ) { CNpcEnemy::processShotDeathEnd( _frames ); - - if ( isSetToShutdown() ) - { - CGameScene::setBossHasBeenKilled(); - } } } diff --git a/source/enemy/nfdutch.cpp b/source/enemy/nfdutch.cpp index c0eadad45..cd10e6768 100644 --- a/source/enemy/nfdutch.cpp +++ b/source/enemy/nfdutch.cpp @@ -670,11 +670,6 @@ void CNpcFlyingDutchmanEnemy::processShotDeathEnd( int _frames ) if ( !m_animPlaying ) { CNpcEnemy::processShotDeathEnd( _frames ); - - if ( isSetToShutdown() ) - { - CGameScene::setBossHasBeenKilled(); - } } } diff --git a/source/enemy/nsshark.cpp b/source/enemy/nsshark.cpp index 7a4c20787..667164d3f 100644 --- a/source/enemy/nsshark.cpp +++ b/source/enemy/nsshark.cpp @@ -670,6 +670,7 @@ void CNpcSubSharkEnemy::processShot( int _frames ) { m_state = NPC_GENERIC_HIT_DEATH_START; m_isDying = true; + CGameScene::setBossHasBeenKilled(); } else { @@ -709,11 +710,6 @@ void CNpcSubSharkEnemy::processShot( int _frames ) if ( !m_animPlaying ) { CNpcEnemy::processShotDeathEnd( _frames ); - - if ( isSetToShutdown() ) - { - CGameScene::setBossHasBeenKilled(); - } } break; diff --git a/source/enemy/nssnake.cpp b/source/enemy/nssnake.cpp index 0309296db..fd772754a 100644 --- a/source/enemy/nssnake.cpp +++ b/source/enemy/nssnake.cpp @@ -1243,7 +1243,6 @@ void CNpcSeaSnakeEnemy::processShot( int _frames ) if ( Pos.vy - offset.vy > VidGetScrH() ) { setToShutdown(); - CGameScene::setBossHasBeenKilled(); } } else