This commit is contained in:
Charles 2001-07-12 14:10:26 +00:00
parent c33c668be3
commit 3626fc1ecc
8 changed files with 46 additions and 9 deletions

View file

@ -75,7 +75,7 @@ void CNpcJellyfishPlatform::collidedWith( CThing *_thisThing )
s32 height = getHeightFromPlatformAtPosition(playerPos.vx,playerPos.vy);
if(playerPos.vx>=collisionArea.x1&&playerPos.vx<=collisionArea.x2&&
if(playerArea.x2>=collisionArea.x1&&playerArea.x1<=collisionArea.x2&&
playerPos.vy>=collisionArea.y1&&playerPos.vy<=collisionArea.y2)
//if(((playerArea.x1>=collisionArea.x1&&playerArea.x1<=collisionArea.x2)||(playerArea.x2>=collisionArea.x1&&playerArea.x2<=collisionArea.x2)||(playerArea.x1<=collisionArea.x1&&playerArea.x2>=collisionArea.x2))&&
//((playerArea.y1>=thatRect.y1&&playerArea.y1<=thatRect.y2)||(playerArea.y2>=thatRect.y1&&playerArea.y2<=thatRect.y2)||(playerArea.y1<=thatRect.y1&&playerArea.y2>=thatRect.y2)))