This commit is contained in:
Charles 2001-05-08 15:35:37 +00:00
parent 7c1e7b2ab7
commit 7459256624

View file

@ -59,10 +59,13 @@ void CNpcFallingNoRespawnPlatform::processMovement( int _frames )
s32 groundHeight = m_layerCollision->getHeightFromGround( Pos.vx + moveX, Pos.vy + moveY, 16 ); s32 groundHeight = m_layerCollision->getHeightFromGround( Pos.vx + moveX, Pos.vy + moveY, 16 );
if ( groundHeight < moveY ) if ( groundHeight < moveY )
{
if ( ( m_layerCollision->getCollisionBlock( Pos.vx, Pos.vy + groundHeight + 8 ) & COLLISION_TYPE_MASK ) != (7<<COLLISION_TYPE_FLAG_SHIFT) )
{ {
moveY = groundHeight; moveY = groundHeight;
moveX = 2 * _frames; moveX = 2 * _frames;
} }
}
Pos.vx += moveX; Pos.vx += moveX;
Pos.vy += moveY; Pos.vy += moveY;