From 6ed09713467daf75c932fef760285933ea9ca4c0 Mon Sep 17 00:00:00 2001
From: Daveo <daveo@localhost>
Date: Wed, 9 May 2001 19:57:57 +0000
Subject: [PATCH]

---
 source/fx/fx.cpp      | 8 +++++---
 source/fx/fx.h        | 3 +++
 source/fx/fxjfish.cpp | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/source/fx/fx.cpp b/source/fx/fx.cpp
index 467e141f4..a1ad85e11 100644
--- a/source/fx/fx.cpp
+++ b/source/fx/fx.cpp
@@ -9,6 +9,7 @@
 #include	"gfx\sprbank.h"
 #include	<sprites.h>
 #include	"level\level.h"
+#include	"gfx\otpos.h"
 
 #include	"FX\FX.h"
 #include	"FX\FXjfish.h"
@@ -127,10 +128,11 @@ CFX		*NewFX;
 /*****************************************************************************/
 void	CFX::init()
 {
-	CFXThing::init();
+		CFXThing::init();
 
-	m_spriteBank=new ("FX Sprite") SpriteBank();
-	m_spriteBank->load(SPRITES_SPRITES_SPR);
+		m_spriteBank=new ("FX Sprite") SpriteBank();
+		m_spriteBank->load(SPRITES_SPRITES_SPR);
+		OtPos=OTPOS__ACTOR_POS;
 }
 
 /*****************************************************************************/
diff --git a/source/fx/fx.h b/source/fx/fx.h
index c3dd758a8..0f4d4eb5f 100644
--- a/source/fx/fx.h
+++ b/source/fx/fx.h
@@ -58,9 +58,12 @@ virtual void		render();
 
 virtual int			canCollide()					{return false;}
 
+virtual	void		SetOtPos(int Ot)				{OtPos=Ot;}
+
 protected:
 	
 	SpriteBank	*m_spriteBank;
+	s32			OtPos;
 };
 
 #endif
diff --git a/source/fx/fxjfish.cpp b/source/fx/fxjfish.cpp
index acd052028..af8f85def 100644
--- a/source/fx/fxjfish.cpp
+++ b/source/fx/fxjfish.cpp
@@ -142,7 +142,7 @@ s16		*dH=HeightTable;
 			for (int i=0; i<Count-1; i++)
 			{
 				if (Idx>=Count) Idx=0;
-				POLY_FT4	*Ft4=m_spriteBank->printFT4(FRM__TENTACLE,LastPos.vx,LastPos.vy,0,0,6);
+				POLY_FT4	*Ft4=m_spriteBank->printFT4(FRM__TENTACLE,LastPos.vx,LastPos.vy,0,0,OtPos);
 
 				Ft4->x0=LastPos.vx+0+LastdW; Ft4->y0=LastPos.vy;
 				Ft4->x1=LastPos.vx+8-LastdW; Ft4->y1=LastPos.vy;