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-30 15:08:29 +00:00
parent 22ac2f0d4a
commit d5b89cc1e7
3 changed files with 45 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

15
source/player/player.cpp
View file

@ -2609,9 +2609,17 @@ int CPlayer::moveVertical(int _moveDistance)
{
if(colHeightBefore[i]>=0&&colHeightAfter[i]<=0)
{
moveRequired[i]=colHeightAfter[i];
hitGround=true;
if(!hitThisSuspectBlock)hitThisSuspectBlock=blockAfter[i];
int goingIntoThisBlock=blockAfter[i]&COLLISION_TYPE_MASK;
if(goingIntoThisBlock!=COLLISION_TYPE_FLAG_DEATH_FALL)
{
moveRequired[i]=colHeightAfter[i];
hitGround=true;
}
else
{
moveRequired[i]=0;
}
if(!hitThisSuspectBlock)hitThisSuspectBlock=goingIntoThisBlock;
}
else
{
@ -2720,6 +2728,7 @@ int CPlayer::moveVertical(int _moveDistance)
// Stood on any important types of collision?
hitThisSuspectBlock=CGameScene::getCollision()->getCollisionBlock(pos.vx,pos.vy+_moveDistance);
}
pos.vy+=_moveDistance;
setPlayerPos(&pos);