zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-07-31 20:29:43 +00:00
parent e58199b54e
commit 08768b4145
1 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

39
source/player/player.cpp
View file

@ -1219,37 +1219,36 @@ if(newmode!=-1)
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CPlayer::detectHazardousSurface() void CPlayer::detectHazardousSurface()
{ {
int height; // DOn't worry if on platform or already dead
if(!isOnPlatform()&&
m_currentMode!=PLAYER_MODE_DEAD)
{
int i;
DVECTOR const &pos=getPlayerPos();
height=CGameScene::getCollision()->getHeightFromGround( Pos.vx, Pos.vy ); for(i=0;i<2;i++)
{
int x,height;
x=pos.vx+(i==0?-checkx:checkx);
height=CGameScene::getCollision()->getHeightFromGround(x,pos.vy);
if(height<=0) if(height<=0)
{ {
CThing *platform;
platform=isOnPlatform();
if(platform)
{
int platformHeight=((CNpcPlatform*)platform)->getHeightFromPlatformAtPosition( Pos.vx, Pos.vy );
if ( platformHeight < height )
{
// on platform, which is higher than ground
return;
}
}
int block; int block;
block=CGameScene::getCollision()->getCollisionBlock(Pos.vx,Pos.vy)&COLLISION_TYPE_MASK; block=CGameScene::getCollision()->getCollisionBlock(x,pos.vy)&COLLISION_TYPE_MASK;
// Death? // Death?
if(m_currentMode!=PLAYER_MODE_DEAD&& if(block==COLLISION_TYPE_FLAG_DEATH_LIQUID)
block==COLLISION_TYPE_FLAG_DEATH_LIQUID)
{ {
dieYouPorousFreak(DEATHTYPE__LIQUID); dieYouPorousFreak(DEATHTYPE__LIQUID);
break;
} }
else if(m_currentMode!=PLAYER_MODE_DEAD&& else if(block==COLLISION_TYPE_FLAG_DEATH_INSTANT)
block==COLLISION_TYPE_FLAG_DEATH_INSTANT)
{ {
dieYouPorousFreak(DEATHTYPE__NORMAL); dieYouPorousFreak(DEATHTYPE__NORMAL);
break;
}
}
} }
} }
} }