From 2a0c8b112fd45c9eb1d6104d95d041b72f843bbb Mon Sep 17 00:00:00 2001
From: Daveo <daveo@localhost>
Date: Fri, 13 Jul 2001 19:55:22 +0000
Subject: [PATCH]

---
 source/fx/fx.cpp       | 2 +-
 source/fx/fxbubble.cpp | 5 ++---
 source/fx/fxbubble.h   | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/source/fx/fx.cpp b/source/fx/fx.cpp
index ab9adeeeb..c23020d72 100644
--- a/source/fx/fx.cpp
+++ b/source/fx/fx.cpp
@@ -79,7 +79,7 @@ CFXBaseAnim::sFXBaseData	FXFireBaseData=
 CFXBaseAnim::sFXBaseData	FXBubbleBaseData=
 {
 		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,
 };
 
diff --git a/source/fx/fxbubble.cpp b/source/fx/fxbubble.cpp
index 90ab37573..ff5c12ce3 100644
--- a/source/fx/fxbubble.cpp
+++ b/source/fx/fxbubble.cpp
@@ -23,7 +23,6 @@ void	CFXBubble::init(DVECTOR const &_Pos)
 		Velocity.vy=-(getRndRange(4)+1);
 		CurrentScaleX=CurrentScaleY=getRndRange(ONE/2)+(ONE/2);
 		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)
 {
+		Life-=_frames;
 		if (Life<=0)
 		{
 			if (renderFrame!=FRM__BUBBLEPOP)
 			{
-//				CSoundMediator::playSfx(CSoundMediator::SFX_BALLOON_POP,false);
 				renderFrame=FRM__BUBBLEPOP;
 			}
 			else
 			{
-				setToShutdown();
+				killFX();
 			}
 		}
 		else
diff --git a/source/fx/fxbubble.h b/source/fx/fxbubble.h
index ab3010176..d94544ec3 100644
--- a/source/fx/fxbubble.h
+++ b/source/fx/fxbubble.h
@@ -13,7 +13,6 @@ class CFXBubble : public CFXBaseAnim
 public:
 		void		init(DVECTOR const &Pos);
 		void		think(int _frames);
-		void		killFX(){};
 
 protected:
 		u16			XIdx;