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-17 16:04:11 +00:00
parent dbd7d3cf31
commit 0a80b2b09c
3 changed files with 98 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

50
source/platform/pfblock.cpp
View file

@ -155,6 +155,56 @@ CRECT const &collisionArea=getCollisionArea();
m_contact = true;
}
else
{
DVECTOR shove;
int leftDist = playerCollisionArea.x2 - collisionArea.x1;
int rightDist = collisionArea.x2 - playerCollisionArea.x1;
if ( leftDist < rightDist )
{
shove.vx = -leftDist;
}
else
{
shove.vx = rightDist;
}
shove.vy = 0;
player->shove( shove );
}
}
else
{
int testPosY;
testPosY = playerPos.vy - CPlayer::HEIGHT_FOR_HEAD_COLLISION;
if ( testPosY >= collisionArea.y1 && testPosY <= collisionArea.y2 )
{
// player's head is colliding with platform, but feet aren't
player->forceFall();
if ( collisionArea.y2 - testPosY > 8 )
{
DVECTOR shove;
int leftDist = playerCollisionArea.x2 - collisionArea.x1;
int rightDist = collisionArea.x2 - playerCollisionArea.x1;
if ( leftDist < rightDist )
{
shove.vx = -leftDist;
}
else
{
shove.vx = rightDist;
}
shove.vy = 0;
player->shove( shove );
}
}
}
}
}