zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-02-28 21:41:07 +00:00
parent b82f7ef496
commit eaa6adda93
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
source/pickups/pickup.cpp
View file

@ -132,11 +132,6 @@ void CBasePickup::think(int _frames)
{
CPickupThing::think(_frames);
thinkPickup(_frames);
if(PadGetDown(0)&PAD_L2)
{
collect(NULL);
}
}
/*----------------------------------------------------------------------

4
source/thing/thing.cpp
View file

@ -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;
}