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-02-15 20:50:52 +00:00
parent 1f37c6678c
commit 2a7ebb2061
4 changed files with 37 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

28
source/enemy/nsstomp.cpp
View file

@ -26,6 +26,9 @@
void CNpc::processCloseSkullStomperAttack( int _frames )
{
s8 groundHeight;
s8 yMovement;
if ( m_timerTimer > 0 )
{
// wait
@ -34,26 +37,15 @@ void CNpc::processCloseSkullStomperAttack( int _frames )
{
if ( m_extendDir == EXTEND_DOWN )
{
if ( m_layerCollision->Get( Pos.vx >> 4, ( Pos.vy + ( m_data[m_type].speed * _frames ) ) >> 4 ) )
yMovement = m_data[m_type].speed * _frames;
groundHeight = m_layerCollision->getHeightFromGround( Pos.vx, Pos.vy, yMovement + 16 );
if ( groundHeight < yMovement )
{
// colliding with ground
s32 distY;
s32 lastPointY = 0;
for ( distY = 1 ; distY <= ( m_data[m_type].speed * _frames ) ; distY++ )
{
if ( m_layerCollision->Get( Pos.vx >> 4, ( Pos.vy + distY ) >> 4 ) )
{
break;
}
else
{
lastPointY++;
}
}
Pos.vy += lastPointY;
Pos.vy += groundHeight;
// pause and change direction
@ -64,7 +56,7 @@ void CNpc::processCloseSkullStomperAttack( int _frames )
{
// drop down
Pos.vy += m_data[m_type].speed * _frames;
Pos.vy += yMovement;
}
}
else