This commit is contained in:
Paul 2001-02-21 22:33:17 +00:00
parent d9de1e680f
commit d27bae5fd0
25 changed files with 392 additions and 190 deletions

View file

@ -76,6 +76,17 @@ void CBubbleMixturePickup::shutdown()
CBasePickup::shutdown();
}
/*----------------------------------------------------------------------
Function:
Purpose:
Params:
Returns:
---------------------------------------------------------------------- */
void CBubbleMixturePickup::collect(class CPlayer *_player)
{
CBasePickup::collect(_player);
}
/*----------------------------------------------------------------------
Function:
Purpose:
@ -84,9 +95,8 @@ void CBubbleMixturePickup::shutdown()
---------------------------------------------------------------------- */
int bubmix_bobspeed=10;
int bubmix_bobscale=3;
void CBubbleMixturePickup::think(int _frames)
void CBubbleMixturePickup::thinkPickup(int _frames)
{
CBasePickup::think(_frames);
m_sin=(m_sin+(_frames*bubmix_bobspeed))&4095;
}
@ -96,32 +106,17 @@ void CBubbleMixturePickup::think(int _frames)
Params:
Returns:
---------------------------------------------------------------------- */
void CBubbleMixturePickup::render()
void CBubbleMixturePickup::renderPickup(DVECTOR *_pos)
{
DVECTOR ofs;
SpriteBank *sprites;
sFrameHdr *fh;
int x,y;
ofs=getRenderOffset();
sprites=getSpriteBank();
fh=sprites->getFrameHeader(FRM__BUBBLEMIXTURE);
x=Pos.vx-ofs.vx-(fh->W/2);
y=Pos.vy-ofs.vy-(fh->H/2)+((msin(m_sin)*bubmix_bobscale)>>12);
x=_pos->vx-(fh->W/2);
y=_pos->vy-(fh->H/2)+((msin(m_sin)*bubmix_bobscale)>>12);
sprites->printFT4(fh,x,y,0,0,PICKUPS_OT_POS);
CBasePickup::render();
}
/*----------------------------------------------------------------------
Function:
Purpose:
Params:
Returns:
---------------------------------------------------------------------- */
void CBubbleMixturePickup::collect(class CPlayer *_player)
{
CBasePickup::collect(_player);
}
/*===========================================================================