This commit is contained in:
parent
1da64afa81
commit
c7fe8c740b
70 changed files with 302 additions and 445 deletions
|
@ -81,7 +81,7 @@ void CNpcFallingBlockPlatform::processMovement( int _frames )
|
|||
}
|
||||
else
|
||||
{
|
||||
DVECTOR offset = CLevel::getCameraPos();
|
||||
DVECTOR const &offset = CLevel::getCameraPos();
|
||||
|
||||
s32 yPos = Pos.vy - offset.vy;
|
||||
|
||||
|
@ -106,15 +106,15 @@ void CNpcFallingBlockPlatform::collidedWith( CThing *_thisThing )
|
|||
case TYPE_PLAYER:
|
||||
{
|
||||
CPlayer *player;
|
||||
DVECTOR playerPos;
|
||||
CRECT collisionArea;
|
||||
CRECT playerCollisionArea;
|
||||
// DVECTOR playerPos;
|
||||
// CRECT collisionArea;
|
||||
// CRECT playerCollisionArea;
|
||||
|
||||
// Only interested in SBs feet colliding with the box (pkg)
|
||||
player=(CPlayer*)_thisThing;
|
||||
playerPos=player->getPos();
|
||||
playerCollisionArea = player->getCollisionArea();
|
||||
collisionArea=getCollisionArea();
|
||||
DVECTOR const &playerPos=player->getPos();
|
||||
CRECT const &playerCollisionArea = player->getCollisionArea();
|
||||
CRECT const &collisionArea=getCollisionArea();
|
||||
|
||||
s32 threshold = abs( collisionArea.y2 - collisionArea.y1 );
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue