diff --git a/Graphics/levels/Chapter02/Level04/Level04.MEX b/Graphics/levels/Chapter02/Level04/Level04.MEX index e03a944b7..73bcffc45 100644 Binary files a/Graphics/levels/Chapter02/Level04/Level04.MEX and b/Graphics/levels/Chapter02/Level04/Level04.MEX differ diff --git a/Graphics/levels/Chapter02/Level04/level04.Mep b/Graphics/levels/Chapter02/Level04/level04.Mep index 90cb0a408..02bcb7976 100644 Binary files a/Graphics/levels/Chapter02/Level04/level04.Mep and b/Graphics/levels/Chapter02/Level04/level04.Mep differ diff --git a/source/enemy/ndogfish.cpp b/source/enemy/ndogfish.cpp index b65425870..5996253ca 100644 --- a/source/enemy/ndogfish.cpp +++ b/source/enemy/ndogfish.cpp @@ -436,7 +436,7 @@ void CNpcIronDogfishEnemy::hasBeenSteamed( DVECTOR &steamPos ) //hasBeenAttacked(); m_steamTimer = 4 * GameState::getOneSecondInFrames(); - m_effect->killFX(); + //m_effect->killFX(); } } diff --git a/source/enemy/nfdutch.cpp b/source/enemy/nfdutch.cpp index 3e5f23ad0..629cbc37b 100644 --- a/source/enemy/nfdutch.cpp +++ b/source/enemy/nfdutch.cpp @@ -753,6 +753,18 @@ void CNpcFlyingDutchmanEnemy::collidedWith(CThing *_thisThing) m_controlFunc = NPC_CONTROL_SHOT; m_state = NPC_GENERIC_HIT_CHECK_HEALTH; + s32 minX, maxX; + m_npcPath.getPathXExtents( &minX, &maxX ); + + if ( m_extension == minX ) + { + m_extension = maxX; + } + else + { + m_extension = minX; + } + drawAttackEffect(); } } @@ -797,14 +809,20 @@ u8 CNpcFlyingDutchmanEnemy::hasBeenAttacked() m_fadeDown = true; m_timerTimer = 0; m_fireCount = 0;*/ + + s32 minX, maxX; + m_npcPath.getPathXExtents( &minX, &maxX ); + + if ( m_extension == minX ) + { + m_extension = maxX; + } + else + { + m_extension = minX; + } } } return( true ); } - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -void CNpcFlyingDutchmanEnemy::shakePlatformLoose() -{ -} diff --git a/source/enemy/nfdutch.h b/source/enemy/nfdutch.h index 96630f787..d946035f8 100644 --- a/source/enemy/nfdutch.h +++ b/source/enemy/nfdutch.h @@ -33,7 +33,6 @@ protected: void processShotRecoil( int _frames ); void processShotDeathEnd( int _frames ); void collidedWith(CThing *_thisThing); - void shakePlatformLoose(); enum NPC_FLYING_DUTCHMAN_STATE { diff --git a/source/enemy/npcdata.cpp b/source/enemy/npcdata.cpp index 9064cd525..e2ff3ec69 100644 --- a/source/enemy/npcdata.cpp +++ b/source/enemy/npcdata.cpp @@ -434,7 +434,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = NPC_CLOSE_NONE, NPC_TIMER_NONE, false, - 4, + 3, 64, DETECT_ALL_COLLISION, DAMAGE__SHOCK_ENEMY, @@ -798,7 +798,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = NPC_CLOSE_NONE, NPC_TIMER_NONE, false, - 4, + 3, 256, DETECT_ALL_COLLISION, DAMAGE__SHOCK_ENEMY,