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-08-07 14:10:12 +00:00
parent b2a09a2182
commit 5146149e2d
1 changed files with 12 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

17
source/hazard/hfalling.cpp
View file

@ -131,19 +131,6 @@ void CNpcFallingHazard::processMovement( int _frames )
groundHeight = CGameScene::getCollision()->getHeightFromGround( Pos.vx, Pos.vy, yMovement + 16 ); groundHeight = CGameScene::getCollision()->getHeightFromGround( Pos.vx, Pos.vy, yMovement + 16 );
if ( groundHeight < yMovement ) if ( groundHeight < yMovement )
{
switch ( CGameScene::getCollision()->getCollisionBlock( Pos.vx, Pos.vy + groundHeight + 8 ) & COLLISION_TYPE_MASK )
{
case COLLISION_TYPE_FLAG_SOLID:
{
// drop down
Pos.vy += yMovement;
break;
}
default:
{ {
if ( m_soundId == NOT_PLAYING ) if ( m_soundId == NOT_PLAYING )
{ {
@ -159,10 +146,6 @@ void CNpcFallingHazard::processMovement( int _frames )
m_bounceDir = getRnd() % 2; m_bounceDir = getRnd() % 2;
m_bouncePos = Pos; m_bouncePos = Pos;
break;
}
}
} }
else else
{ {