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-04-23 13:51:25 +00:00
parent 7aae7cb40e
commit 0ed8685ac0
2 changed files with 51 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

133
source/enemy/nbblob.cpp
View file

@ -32,6 +32,9 @@ void CNpcBallBlobEnemy::postInit()
m_heading = m_fireHeading = 128; m_heading = m_fireHeading = 128;
m_npcPath.setPathType( CNpcPath::PONG_PATH ); m_npcPath.setPathType( CNpcPath::PONG_PATH );
m_velocity.vx = 0;
m_velocity.vy = -5;
} }
void CNpcBallBlobEnemy::processMovement( int _frames ) void CNpcBallBlobEnemy::processMovement( int _frames )
@ -42,6 +45,7 @@ void CNpcBallBlobEnemy::processMovement( int _frames )
s32 waypointXDist; s32 waypointXDist;
s32 waypointYDist; s32 waypointYDist;
s32 waypointHeading; s32 waypointHeading;
s32 groundHeight;
if ( !m_animPlaying && m_frame != 0 ) if ( !m_animPlaying && m_frame != 0 )
{ {
@ -58,101 +62,64 @@ void CNpcBallBlobEnemy::processMovement( int _frames )
return; return;
} }
// deal with vertical
m_velocity.vy += 128;
if ( m_velocity.vy > ( 5 << 8 ) )
{
m_velocity.vy = 5 << 8;
}
else if ( m_velocity.vy < -( 5 << 8 ) )
{
m_velocity.vy = -( 5 << 8 );
}
moveY = ( m_velocity.vy >> 8 ) * _frames;
groundHeight = m_layerCollision->getHeightFromGround( Pos.vx + moveX, Pos.vy + moveY, 16 );
if ( groundHeight < 0 )
{
if ( m_velocity.vy > 0 )
{
m_velocity.vy = -m_velocity.vy;
m_animPlaying = true;
m_animNo = ANIM_BALLBLOB_BOUNCE;
m_frame = 0;
}
else
{
m_velocity.vy = -( 5 << 8 );
m_animPlaying = true;
m_animNo = ANIM_BALLBLOB_BOUNCE;
m_frame = 0;
}
moveY = groundHeight;
}
// deal with horizontal // deal with horizontal
bool pathComplete; bool pathComplete;
if ( m_npcPath.thinkFlat( Pos, &pathComplete, &waypointXDist, &waypointYDist, &waypointHeading ) ) if ( m_npcPath.thinkFlat( Pos, &pathComplete, &waypointXDist, &waypointYDist, &waypointHeading ) )
{ {
// increment waypoint if ( m_animNo != ANIM_BALLBLOB_BOUNCE )
{
m_animPlaying = true;
m_animNo = ANIM_BALLBLOB_WOBBLE;
m_frame = 0;
}
}
if ( waypointHeading == 0 ) if ( waypointHeading == 0 )
{ {
// head right moveX = m_data[m_type].speed * _frames;
if ( m_heading >= 1024 && m_heading <= 3072 )
{
// currently heading in the wrong direction, reverse horizontal
s32 headingDiff = m_heading - 2048;
headingDiff = -headingDiff;
headingDiff += 4096;
m_heading = headingDiff % 4096;
m_animPlaying = true;
m_animNo = ANIM_BALLBLOB_WOBBLE;
m_frame = 0;
}
} }
else else
{ {
// head left moveX = -m_data[m_type].speed * _frames;
if ( m_heading < 1024 || m_heading > 3072 )
{
// currently heading in the wrong direction, reverse horizontal
s32 headingDiff = m_heading;
headingDiff = -headingDiff;
headingDiff += 6144;
m_heading = headingDiff % 4096;
m_animPlaying = true;
m_animNo = ANIM_BALLBLOB_WOBBLE;
m_frame = 0;
}
}
}
s32 preShiftX = _frames * m_data[m_type].speed * rcos( m_heading );
s32 preShiftY = _frames * m_data[m_type].speed * rsin( m_heading );
moveX = preShiftX >> 12;
if ( !moveX && preShiftX )
{
moveX = preShiftX / abs( preShiftX );
}
moveY = preShiftY >> 12;
if ( !moveY && preShiftY )
{
moveY = preShiftY / abs( preShiftY );
}
// deal with vertical
if ( Pos.vy < 0 || m_layerCollision->Get( ( Pos.vx + moveX ) >> 4, ( Pos.vy + moveY ) >> 4 ) )
{
// reflect heading in vertical
m_heading = 4096 - m_heading;
m_animPlaying = true;
m_animNo = ANIM_BALLBLOB_BOUNCE;
m_frame = 0;
// get new movement values
preShiftX = _frames * m_data[m_type].speed * rcos( m_heading );
preShiftY = _frames * m_data[m_type].speed * rsin( m_heading );
moveX = preShiftX >> 12;
if ( !moveX && preShiftX )
{
moveX = preShiftX / abs( preShiftX );
}
moveY = preShiftY >> 12;
if ( !moveY && preShiftY )
{
moveY = preShiftY / abs( preShiftY );
}
} }
processMovementModifier( _frames, moveX, moveY, moveVel, moveDist ); processMovementModifier( _frames, moveX, moveY, moveVel, moveDist );

2
source/enemy/nbblob.h
View file

@ -20,6 +20,8 @@ public:
virtual void postInit(); virtual void postInit();
protected: protected:
virtual void processMovement( int _frames ); virtual void processMovement( int _frames );
DVECTOR m_velocity;
}; };
#endif #endif