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

Browse source
This commit is contained in:
Daveo 2001-07-13 19:55:22 +00:00
parent 941d0074a2
commit 2a0c8b112f
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/fx/fx.cpp
View file

@ -79,7 +79,7 @@ CFXBaseAnim::sFXBaseData FXFireBaseData=
CFXBaseAnim::sFXBaseData FXBubbleBaseData= CFXBaseAnim::sFXBaseData FXBubbleBaseData=
{ {
FRM__BUBBLE_2,FRM__BUBBLE_2,1, FRM__BUBBLE_2,FRM__BUBBLE_2,1,
FX_FLAG_LOOP | FX_FLAG_COLLIDE_KILL | FX_FLAG_NO_THINK_KILL | FX_FLAG_HAS_LIFE, FX_FLAG_LOOP | FX_FLAG_COLLIDE_KILL | FX_FLAG_NO_THINK_KILL,
0,0, 0,0,
}; };

5
source/fx/fxbubble.cpp
View file

@ -23,7 +23,6 @@ void CFXBubble::init(DVECTOR const &_Pos)
Velocity.vy=-(getRndRange(4)+1); Velocity.vy=-(getRndRange(4)+1);
CurrentScaleX=CurrentScaleY=getRndRange(ONE/2)+(ONE/2); CurrentScaleX=CurrentScaleY=getRndRange(ONE/2)+(ONE/2);
XIdx=getRnd()&15; XIdx=getRnd()&15;
} }
/*****************************************************************************/ /*****************************************************************************/
@ -33,16 +32,16 @@ static const s16 XT[16]={ 0,+1,+0,+1,+0, 0,-1,+0,-1,+0,0,+1,+0,+1,+0,};
void CFXBubble::think(int _frames) void CFXBubble::think(int _frames)
{ {
Life-=_frames;
if (Life<=0) if (Life<=0)
{ {
if (renderFrame!=FRM__BUBBLEPOP) if (renderFrame!=FRM__BUBBLEPOP)
{ {
// CSoundMediator::playSfx(CSoundMediator::SFX_BALLOON_POP,false);
renderFrame=FRM__BUBBLEPOP; renderFrame=FRM__BUBBLEPOP;
} }
else else
{ {
setToShutdown(); killFX();
} }
} }
else else

1
source/fx/fxbubble.h
View file

@ -13,7 +13,6 @@ class CFXBubble : public CFXBaseAnim
public: public:
void init(DVECTOR const &Pos); void init(DVECTOR const &Pos);
void think(int _frames); void think(int _frames);
void killFX(){};
protected: protected:
u16 XIdx; u16 XIdx;