From edc12f1ab15ec325c9d2f7f2d61b339f3256e8f7 Mon Sep 17 00:00:00 2001
From: Charles <charles@localhost>
Date: Fri, 3 Aug 2001 13:00:09 +0000
Subject: [PATCH]

---
 source/fx/fxbasetrail.cpp    |  9 +++------
 source/triggers/tsswitch.cpp | 22 +++++++++++++++++++++-
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/source/fx/fxbasetrail.cpp b/source/fx/fxbasetrail.cpp
index 6022defd9..79a82243f 100644
--- a/source/fx/fxbasetrail.cpp
+++ b/source/fx/fxbasetrail.cpp
@@ -42,12 +42,9 @@ bool	hasParent=getFXParentPos(Pos);
 /*****************************************************************************/
 CFXBaseTrail::sList	&CFXBaseTrail::moveHead()
 {
-		if ( !( Flags & FX_FLAG_HIDDEN ) )
-		{
-			HeadIdx--;
-			if (HeadIdx<0) HeadIdx+=LIST_SIZE;
-			if (ListCount<LIST_SIZE) ListCount++;
-		}
+		HeadIdx--;
+		if (HeadIdx<0) HeadIdx+=LIST_SIZE;
+		if (ListCount<LIST_SIZE) ListCount++;
 
 		return(List[HeadIdx]);
 }
diff --git a/source/triggers/tsswitch.cpp b/source/triggers/tsswitch.cpp
index 07413011f..f75dcfdb3 100644
--- a/source/triggers/tsswitch.cpp
+++ b/source/triggers/tsswitch.cpp
@@ -23,6 +23,7 @@
 #include "enemy\npc.h"
 #endif
 
+#include "fx\fxsteam.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -32,14 +33,33 @@ void	CSteamSwitchEmitterTrigger::setPositionAndSize(int _x,int _y,int _w,int _h)
 
 	m_effect = CFX::Create( CFX::FX_TYPE_STEAM, Pos );
 	m_active = true;
+
+	CFXSteam *steam = (CFXSteam *) m_effect;
+	DVECTOR velocity;
+	velocity.vx = 0;
+	velocity.vy = -1;
+	steam->SetVel( velocity );
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void	CSteamSwitchEmitterTrigger::toggleVisible()
 {
-	m_effect->toggleVisible();
 	m_active = !m_active;
+
+	CFXSteam *steam = (CFXSteam *) m_effect;
+	DVECTOR velocity;
+	velocity.vx = 0;
+	velocity.vy = -4 * m_active;
+	if ( m_active )
+	{
+		steam->SetSize( 4 * ONE );
+	}
+	else
+	{
+		steam->SetSize( ONE );
+	}
+	steam->SetVel( velocity );
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////