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-03 15:02:50 +00:00
parent 9f9c74bd97
commit 02829c7404
3 changed files with 62 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Graphics/levels/Chapter01/Level04/Level04.MEX
View file

Binary file not shown.

BIN
Graphics/levels/Chapter01/Level04/level04.Mep
View file

Binary file not shown.

13
source/enemy/nmjfish.cpp
View file

@ -82,7 +82,7 @@ void CNpcMotherJellyfishEnemy::postInit()
targetPos = Pos; targetPos = Pos;
m_movementTimer = GameState::getOneSecondInFrames() * 5; m_movementTimer = GameState::getOneSecondInFrames() * 2;
m_pulsateTimer = GameState::getOneSecondInFrames(); m_pulsateTimer = GameState::getOneSecondInFrames();
m_renderScale = 2048 + ( ( ( 4096 - 2048 ) * m_health ) / m_data[m_type].initHealth ); m_renderScale = 2048 + ( ( ( 4096 - 2048 ) * m_health ) / m_data[m_type].initHealth );
@ -188,7 +188,7 @@ void CNpcMotherJellyfishEnemy::processMovement( int _frames )
projectile->setSpeed( 6 ); projectile->setSpeed( 6 );
projectile->setXScale( 8192 ); projectile->setXScale( 8192 );
m_movementTimer = GameState::getOneSecondInFrames() * 5; m_movementTimer = GameState::getOneSecondInFrames() * 2;
m_pulsateTimer = GameState::getOneSecondInFrames(); m_pulsateTimer = GameState::getOneSecondInFrames();
m_pauseTimer = m_maxPauseTimer; m_pauseTimer = m_maxPauseTimer;
@ -693,7 +693,11 @@ void CNpcMotherJellyfishEnemy::processShot( int _frames )
void CNpcMotherJellyfishEnemy::collidedWith(CThing *_thisThing) void CNpcMotherJellyfishEnemy::collidedWith(CThing *_thisThing)
{ {
if ( m_state == MOTHER_JELLYFISH_CYCLE ) switch( m_state )
{
case MOTHER_JELLYFISH_CYCLE:
case MOTHER_JELLYFISH_STRAFE_START:
case MOTHER_JELLYFISH_STRAFE:
{ {
if ( m_isActive && !m_isCaught && !m_isDying ) if ( m_isActive && !m_isCaught && !m_isDying )
{ {
@ -775,5 +779,8 @@ void CNpcMotherJellyfishEnemy::collidedWith(CThing *_thisThing)
break; break;
} }
} }
break;
}
} }
} }