This commit is contained in:
Daveo 2001-07-05 16:01:05 +00:00
parent d64d22c9f8
commit 8f23574cd6
3 changed files with 20 additions and 5 deletions

View file

@ -177,8 +177,9 @@ fx_src := fx \
fxsteam \ fxsteam \
fxlaser \ fxlaser \
fxsmoke \ fxsmoke \
fxgeyser \
fxtvexplode \ fxtvexplode \
fxgeyser fxzzzz
projectl_src := projectl \ projectl_src := projectl \
prnpc \ prnpc \

View file

@ -30,6 +30,7 @@
#include "FX\FXNrgBar.h" #include "FX\FXNrgBar.h"
#include "FX\FXTVExplode.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; int FXType=(CFX::FX_TYPE)CFX::FX_TYPE_ZZZZ;
#include "game\game.h"
#include "game\game.h"
CFXZZZZ *TFX=0;
void TestFX(DVECTOR Pos,CThing *Parent) void TestFX(DVECTOR Pos,CThing *Parent)
{ {
Pos.vy-=16*8; Pos.vy-=16*4;
CFX::Create((CFX::FX_TYPE)FXType,Pos); if (!TFX)
{
TFX=(CFXZZZZ*)CFX::Create((CFX::FX_TYPE)FXType,Pos);
}
else
{
TFX->killFX();
TFX=0;
}
// CFX::Create((CFX::FX_TYPE)FXType,Parent); // CFX::Create((CFX::FX_TYPE)FXType,Parent);
} }
@ -260,6 +270,9 @@ CFX *NewFX;
case FX_TYPE_TV_EXPLODE: case FX_TYPE_TV_EXPLODE:
NewFX=new ("FX TVExplode") CFXTVExplode(); NewFX=new ("FX TVExplode") CFXTVExplode();
break; break;
case FX_TYPE_ZZZZ:
NewFX=new ("FX ZZZZ") CFXZZZZ();
break;
default: default:
ASSERT(!"UNKNOWN FX TYPE"); ASSERT(!"UNKNOWN FX TYPE");

View file

@ -69,6 +69,7 @@ public:
/* 28*/ FX_TYPE_NRG_BAR, /* 28*/ FX_TYPE_NRG_BAR,
/* 29*/ FX_TYPE_LASER, /* 29*/ FX_TYPE_LASER,
/* 30*/ FX_TYPE_TV_EXPLODE, /* 30*/ FX_TYPE_TV_EXPLODE,
/* 31*/ FX_TYPE_ZZZZ,
FX_TYPE_MAX FX_TYPE_MAX
}; };