This commit is contained in:
parent
c76bf22672
commit
32048ee446
@ -167,6 +167,7 @@ void CNpcSeaSnakeEnemy::postInit()
|
||||
m_collTimer = 0;
|
||||
m_meterOn=false;
|
||||
m_turnDir = 0;
|
||||
m_waitTimer = 0;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
@ -250,6 +251,12 @@ void CNpcSeaSnakeEnemy::processMovement( int _frames )
|
||||
}
|
||||
}
|
||||
|
||||
if ( m_waitTimer > 0 )
|
||||
{
|
||||
m_waitTimer -= _frames;
|
||||
}
|
||||
else
|
||||
{
|
||||
switch( m_turnDir )
|
||||
{
|
||||
case NPC_SEA_SNAKE_CIRCLE_CLOCKWISE:
|
||||
@ -347,6 +354,7 @@ void CNpcSeaSnakeEnemy::processMovement( int _frames )
|
||||
// if next waypoint is ALSO a start/end waypoint, teleport directly to it
|
||||
|
||||
moveEntireSnake( waypointPos );
|
||||
m_waitTimer = 3 * GameState::getOneSecondInFrames();
|
||||
oldPos.vx = waypointPos.vx;
|
||||
oldPos.vy = waypointPos.vy;
|
||||
|
||||
@ -405,6 +413,7 @@ void CNpcSeaSnakeEnemy::processMovement( int _frames )
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Pos.vx += moveX;
|
||||
Pos.vy += moveY;
|
||||
|
@ -97,6 +97,7 @@ protected:
|
||||
u8 m_turnDir;
|
||||
s16 m_circleHeading;
|
||||
s16 m_origHeading;
|
||||
s32 m_waitTimer;
|
||||
};
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user