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-07-19 15:46:54 +00:00
parent 58cb24e18d
commit 141ae62ceb
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/pickups/pickup.cpp
View file

@ -139,7 +139,6 @@ void CBasePickup::shutdown()
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
#include "pad\pads.h"
void CBasePickup::think(int _frames) void CBasePickup::think(int _frames)
{ {
CPickupThing::think(_frames); CPickupThing::think(_frames);
@ -209,7 +208,6 @@ void CBasePickup::collect(class CPlayer *_player)
{ {
shutdown(); shutdown();
CThingManager::DeleteThing(this); CThingManager::DeleteThing(this);
// delete this;
} }
@ -507,9 +505,11 @@ return NULL;
pickup->setThingSubType(_type); pickup->setThingSubType(_type);
pickup->init(); pickup->init();
pickupPos=pickup->getSizeForPlacement(); // pickupPos=pickup->getSizeForPlacement();
pickupPos.vx=_pos->vx+(pickupPos.vx/2); // pickupPos.vx=_pos->vx-(pickupPos.vx/2);
pickupPos.vy=_pos->vy+(pickupPos.vy/2)-16; // pickupPos.vy=_pos->vy-(pickupPos.vy);
pickupPos=*_pos;
pickupPos.vy-=pickup->getSizeForPlacement().vy/2;
pickup->setPos(&pickupPos); pickup->setPos(&pickupPos);
return pickup; return pickup;