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-05-22 14:00:18 +00:00
parent 2ab1ff8301
commit 7de1ac5225
1 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
source/enemy/nbblob.cpp
View file

@ -47,20 +47,12 @@ void CNpcBallBlobEnemy::processMovement( int _frames )
s32 waypointHeading; s32 waypointHeading;
s32 groundHeight; s32 groundHeight;
if ( !m_animPlaying && m_frame != 0 ) if ( !m_animPlaying )
{ {
m_animPlaying = true;
m_animNo = ANIM_BALLBLOB_IDLE; m_animNo = ANIM_BALLBLOB_IDLE;
m_frame = 0; m_frame = 0;
} }
else if ( m_animNo == ANIM_BALLBLOB_IDLE )
{
moveX = 0;
moveY = 0;
processMovementModifier( _frames, moveX, moveY, moveVel, moveDist );
return;
}
// deal with vertical // deal with vertical
@ -84,16 +76,10 @@ void CNpcBallBlobEnemy::processMovement( int _frames )
if ( m_velocity.vy > 0 ) if ( m_velocity.vy > 0 )
{ {
m_velocity.vy = -m_velocity.vy; m_velocity.vy = -m_velocity.vy;
m_animPlaying = true;
m_animNo = ANIM_BALLBLOB_IDLE;
m_frame = 0;
} }
else else
{ {
m_velocity.vy = -( 5 << 8 ); m_velocity.vy = -( 5 << 8 );
m_animPlaying = true;
m_animNo = ANIM_BALLBLOB_IDLE;
m_frame = 0;
} }
moveY = groundHeight; moveY = groundHeight;
@ -103,15 +89,7 @@ void CNpcBallBlobEnemy::processMovement( int _frames )
bool pathComplete; bool pathComplete;
if ( m_npcPath.thinkFlat( Pos, &pathComplete, &waypointXDist, &waypointYDist, &waypointHeading ) ) m_npcPath.thinkFlat( Pos, &pathComplete, &waypointXDist, &waypointYDist, &waypointHeading );
{
if ( m_animNo != ANIM_BALLBLOB_IDLE)
{
m_animPlaying = true;
m_animNo = ANIM_BALLBLOB_IDLE;
m_frame = 0;
}
}
if ( waypointHeading == 0 ) if ( waypointHeading == 0 )
{ {