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-22 14:20:57 +00:00
parent 500ba0e347
commit f33393cfed
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Graphics/levels/Chapter04/Level02/Level02.MEX
View file

Binary file not shown.

BIN
Graphics/levels/Chapter04/Level02/Level02.Mep
View file

Binary file not shown.

8
source/player/player.cpp
View file

@ -2611,8 +2611,8 @@ void CPlayer::shove( DVECTOR const &move )
while( xDist ) while( xDist )
{ {
colHeight=CGameScene::getCollision()->getHeightFromGround(Pos.vx+xDist,Pos.vy,5); colHeight=CGameScene::getCollision()->getHeightFromGround(Pos.vx+xDist,Pos.vy-HEIGHT_FOR_HEAD_COLLISION,HEIGHT_FOR_HEAD_COLLISION+1);
if ( colHeight < 0 ) if ( colHeight < HEIGHT_FOR_HEAD_COLLISION )
{ {
break; break;
} }
@ -2641,7 +2641,7 @@ void CPlayer::shove( DVECTOR const &move )
} }
} }
if(colHeight<0) if(colHeight<HEIGHT_FOR_HEAD_COLLISION)
{ {
// Stop at the edge of the obstruction // Stop at the edge of the obstruction
int dir,vx,cx,i; int dir,vx,cx,i;
@ -2658,7 +2658,7 @@ void CPlayer::shove( DVECTOR const &move )
cx=Pos.vx; cx=Pos.vx;
for(i=0;i<vx;i++) for(i=0;i<vx;i++)
{ {
if(CGameScene::getCollision()->getHeightFromGround(cx,Pos.vy)<0) if(CGameScene::getCollision()->getHeightFromGround(cx,Pos.vy-HEIGHT_FOR_HEAD_COLLISION,HEIGHT_FOR_HEAD_COLLISION+1)<HEIGHT_FOR_HEAD_COLLISION)
{ {
break; break;
} }