This commit is contained in:
Charles 2001-06-19 20:21:26 +00:00
parent adee4b97be
commit 5177f930ff
2 changed files with 18 additions and 2 deletions

View file

@ -97,6 +97,15 @@ void CNpcBubblePlatform::processMovement( int _frames )
m_pop = true; m_pop = true;
} }
} }
DVECTOR offset = CLevel::getCameraPos();
s32 yPos = Pos.vy - offset.vy;
if ( yPos < 0 )
{
setToShutdown();
}
} }
} }

View file

@ -48,13 +48,13 @@ void CNpcFallingNoRespawnPlatform::processMovement( int _frames )
s32 distX, distY, heading; s32 distX, distY, heading;
bool pathComplete; bool pathComplete;
DVECTOR offset = CLevel::getCameraPos();
if ( m_spinFinish ) if ( m_spinFinish )
{ {
m_rotation += 64 * _frames; m_rotation += 64 * _frames;
m_rotation &= 4095; m_rotation &= 4095;
DVECTOR offset = CLevel::getCameraPos();
if ( m_bounceDir ) if ( m_bounceDir )
{ {
Pos.vx += 2 * _frames; Pos.vx += 2 * _frames;
@ -109,6 +109,13 @@ void CNpcFallingNoRespawnPlatform::processMovement( int _frames )
} }
} }
} }
s32 yPos = Pos.vy - offset.vy;
if ( yPos > VidGetScrH() + 100 )
{
setToShutdown();
}
} }
Pos.vx += moveX; Pos.vx += moveX;