From eaa6adda933f3935fd0b3714b61a967cf8cfba54 Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 28 Feb 2001 21:41:07 +0000 Subject: [PATCH] --- source/pickups/pickup.cpp | 5 ----- source/thing/thing.cpp | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/source/pickups/pickup.cpp b/source/pickups/pickup.cpp index 1cab4b5d2..98c117e21 100644 --- a/source/pickups/pickup.cpp +++ b/source/pickups/pickup.cpp @@ -132,11 +132,6 @@ void CBasePickup::think(int _frames) { CPickupThing::think(_frames); thinkPickup(_frames); - -if(PadGetDown(0)&PAD_L2) -{ - collect(NULL); -} } /*---------------------------------------------------------------------- diff --git a/source/thing/thing.cpp b/source/thing/thing.cpp index 28ceb7d83..bc3301b03 100644 --- a/source/thing/thing.cpp +++ b/source/thing/thing.cpp @@ -475,8 +475,8 @@ int CThing::checkCollisionAgainst(CThing *_thisThing) thisRect=getCollisionArea(); thatRect=_thisThing->getCollisionArea(); - if(((thisRect.x1>=thatRect.x1&&thisRect.x1<=thatRect.x2)||(thisRect.x2>=thatRect.x1&&thisRect.x2<=thatRect.x2))&& - ((thisRect.y1>=thatRect.y1&&thisRect.y1<=thatRect.y2)||(thisRect.y2>=thatRect.y1&&thisRect.y2<=thatRect.y2))) + if(((thisRect.x1>=thatRect.x1&&thisRect.x1<=thatRect.x2)||(thisRect.x2>=thatRect.x1&&thisRect.x2<=thatRect.x2)||(thisRect.x1<=thatRect.x1&&thisRect.x2>=thatRect.x2))&& + ((thisRect.y1>=thatRect.y1&&thisRect.y1<=thatRect.y2)||(thisRect.y2>=thatRect.y1&&thisRect.y2<=thatRect.y2)||(thisRect.y1<=thatRect.y1&&thisRect.y2>=thatRect.y2))) { collided=true; }