From dff59d4f33f6635ed94b37920a4ad0e038949d99 Mon Sep 17 00:00:00 2001
From: Daveo <daveo@localhost>
Date: Wed, 23 May 2001 19:27:05 +0000
Subject: [PATCH]

---
 source/fx/fx.cpp      | 19 +++++++++++++++----
 source/fx/fxsteam.cpp |  3 ++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/source/fx/fx.cpp b/source/fx/fx.cpp
index 7318f95ea..ba98d35ee 100644
--- a/source/fx/fx.cpp
+++ b/source/fx/fx.cpp
@@ -15,6 +15,7 @@
 #include	"FX\FXjfish.h"
 #include	"FX\FXfallingTile.h"
 #include	"FX\FXSteam.h"
+#include	"FX\FXSplash.h"
 /* FX
 
 	Jellyfish legs
@@ -63,7 +64,9 @@ Level Effect Emitters
 
 */
 
+
 /*****************************************************************************/
+/*
 CFXSteam	*TestFXPtr=0;
 void	TestFX(DVECTOR Pos)
 {
@@ -79,6 +82,13 @@ void	TestFX(DVECTOR Pos)
 			TestFXPtr=0;
 		}
 }
+*/
+/*****************************************************************************/
+void	TestFX(DVECTOR Pos)
+{
+		CFX::Create(CFX::FX_TYPE_SPLASH,Pos);
+//		TestFXPtr->setLife(32);
+}
 
 /*****************************************************************************/
 CFX		*CFX::Create(const FX_TYPE Type)
@@ -88,12 +98,14 @@ CFX		*NewFX;
 		switch(Type)
 		{
 		case FX_TYPE_FALLINGTILE:
-			NewFX=new ("Falling Tile") CFXFallingTile();
+			NewFX=new ("FXFalling Tile") CFXFallingTile();
 			break;
 		case FX_TYPE_STEAM:
-			NewFX=new ("Steam") CFXSteam();
+			NewFX=new ("FXSteam") CFXSteam();
+			break;
+		case FX_TYPE_SPLASH:
+			NewFX=new ("FXSplash") CFXSplash();
 			break;
-
 		case FX_TYPE_JELLYFISH_LEGS:
 //			NewFX=new ("JellyFish Legs") CFXJellyFishLegs();
 			ASSERT(!"FISH LEGS OUT OF STOCK\n");
@@ -114,7 +126,6 @@ CFX		*NewFX;
 			case FX_TYPE_DROP_ACID:
 			case FX_TYPE_DROP_LAVA:
 			case FX_TYPE_DROP_OIL:
-		case FX_TYPE_SPLASH:
 			case FX_TYPE_SPLASH_WATER:
 			case FX_TYPE_SPLASH_ACID:
 			case FX_TYPE_SPLASH_LAVA:
diff --git a/source/fx/fxsteam.cpp b/source/fx/fxsteam.cpp
index 992e21037..4c0a2fad5 100644
--- a/source/fx/fxsteam.cpp
+++ b/source/fx/fxsteam.cpp
@@ -12,7 +12,7 @@
 
 #include	"FX\FXSteam.h"
 
-static const	int		DefSize=4;
+static const	int		DefSize=4*ONE;
 static const	int		DefAngleInc=999;
 static const	int		DefShadeBase=255;
 static const	int		DefShadeDec=8;
@@ -40,6 +40,7 @@ void	CFXSteam::shutdown()
 /*****************************************************************************/
 void	CFXSteam::SetSize(int Size)
 {
+		Size>>=12;
 		ScaleInc=(4096/LIST_SIZE)*Size;
 		BaseVel.vx=0;
 		BaseVel.vy=-Size;