This commit is contained in:
parent
a45411a429
commit
1e71957df5
1 changed files with 17 additions and 6 deletions
|
@ -226,7 +226,8 @@ void CNpcSubSharkEnemy::processMovement( int _frames )
|
||||||
if( abs( distY ) == 0 )
|
if( abs( distY ) == 0 )
|
||||||
{
|
{
|
||||||
m_state = SUB_SHARK_START_CHARGE;
|
m_state = SUB_SHARK_START_CHARGE;
|
||||||
m_timerTimer = GameState::getOneSecondInFrames();
|
m_timerTimer = GameState::getOneSecondInFrames() >> 8;
|
||||||
|
m_movementTimer = GameState::getOneSecondInFrames();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -245,11 +246,7 @@ void CNpcSubSharkEnemy::processMovement( int _frames )
|
||||||
m_frame = 0;
|
m_frame = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( m_timerTimer > 0 )
|
if ( m_movementTimer <= 0 )
|
||||||
{
|
|
||||||
m_timerTimer -= _frames;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
s32 minX, maxX, minY, maxY;
|
s32 minX, maxX, minY, maxY;
|
||||||
|
|
||||||
|
@ -262,6 +259,20 @@ void CNpcSubSharkEnemy::processMovement( int _frames )
|
||||||
m_state = SUB_SHARK_CHARGE;
|
m_state = SUB_SHARK_CHARGE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( m_timerTimer > 0 )
|
||||||
|
{
|
||||||
|
m_timerTimer -= _frames;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
DVECTOR bubblePos = Pos;
|
||||||
|
bubblePos.vx -= 20 + ( getRnd() % 30 );
|
||||||
|
bubblePos.vy -= getRnd() % 50;
|
||||||
|
CFX::Create( CFX::FX_TYPE_BUBBLE_WATER, bubblePos );
|
||||||
|
|
||||||
|
m_timerTimer = GameState::getOneSecondInFrames() >> 8;
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue