From 8f23574cd643f4f5abbbe1ae4e47bd0184743567 Mon Sep 17 00:00:00 2001 From: Daveo Date: Thu, 5 Jul 2001 16:01:05 +0000 Subject: [PATCH] --- makefile.gaz | 3 ++- source/fx/fx.cpp | 21 +++++++++++++++++---- source/fx/fx.h | 1 + 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/makefile.gaz b/makefile.gaz index e8e875d98..5f81e8857 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -177,8 +177,9 @@ fx_src := fx \ fxsteam \ fxlaser \ fxsmoke \ + fxgeyser \ fxtvexplode \ - fxgeyser + fxzzzz projectl_src := projectl \ prnpc \ diff --git a/source/fx/fx.cpp b/source/fx/fx.cpp index ddb561812..ff8a3b3fc 100644 --- a/source/fx/fx.cpp +++ b/source/fx/fx.cpp @@ -30,6 +30,7 @@ #include "FX\FXNrgBar.h" #include "FX\FXTVExplode.h" +#include "FX\FXZzzz.h" /*****************************************************************************/ /*****************************************************************************/ @@ -102,13 +103,22 @@ void TestFX(DVECTOR Pos,CThing *Parent) */ /*****************************************************************************/ -int FXType=(CFX::FX_TYPE)CFX::FX_TYPE_TV_EXPLODE; -#include "game\game.h" +int FXType=(CFX::FX_TYPE)CFX::FX_TYPE_ZZZZ; +#include "game\game.h" +CFXZZZZ *TFX=0; void TestFX(DVECTOR Pos,CThing *Parent) { - Pos.vy-=16*8; - CFX::Create((CFX::FX_TYPE)FXType,Pos); + Pos.vy-=16*4; + if (!TFX) + { + TFX=(CFXZZZZ*)CFX::Create((CFX::FX_TYPE)FXType,Pos); + } + else + { + TFX->killFX(); + TFX=0; + } // CFX::Create((CFX::FX_TYPE)FXType,Parent); } @@ -260,6 +270,9 @@ CFX *NewFX; case FX_TYPE_TV_EXPLODE: NewFX=new ("FX TVExplode") CFXTVExplode(); break; + case FX_TYPE_ZZZZ: + NewFX=new ("FX ZZZZ") CFXZZZZ(); + break; default: ASSERT(!"UNKNOWN FX TYPE"); diff --git a/source/fx/fx.h b/source/fx/fx.h index 7ce7dac98..84b45067b 100644 --- a/source/fx/fx.h +++ b/source/fx/fx.h @@ -69,6 +69,7 @@ public: /* 28*/ FX_TYPE_NRG_BAR, /* 29*/ FX_TYPE_LASER, /* 30*/ FX_TYPE_TV_EXPLODE, +/* 31*/ FX_TYPE_ZZZZ, FX_TYPE_MAX };