zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Daveo 2001-07-21 19:06:07 +00:00
parent d6b7483cc6
commit d105d9ee97
5 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
source/fx/fx.cpp
View file

@ -23,6 +23,7 @@
#include "FX\FXLaser.h"
#include "FX\FXThwack.h"
#include "FX\FXBubble.h"
#include "FX\FXFire.h"
#include "FX\FXfallingTile.h"
#include "FX\FXSteam.h"
#include "FX\FXGeyser.h"
@ -103,13 +104,13 @@ void TestFX(DVECTOR Pos,CThing *Parent)
*/
/*****************************************************************************/
int FXType=(CFX::FX_TYPE)CFX::FX_TYPE_ZZZZ;
int FXType=(CFX::FX_TYPE)CFX::FX_TYPE_FLAMES;
#include "game\game.h"
CFXZZZZ *TFX=0;
void TestFX(DVECTOR Pos,CThing *Parent)
{
Pos.vy-=16*4;
/*
if (!TFX)
{
TFX=(CFXZZZZ*)CFX::Create((CFX::FX_TYPE)FXType,Pos);
@ -119,7 +120,8 @@ void TestFX(DVECTOR Pos,CThing *Parent)
TFX->killFX();
TFX=0;
}
// CFX::Create((CFX::FX_TYPE)FXType,Parent);
*/
CFX::Create((CFX::FX_TYPE)FXType,Pos);
}
@ -240,7 +242,7 @@ CFX *NewFX;
ASSERT(!"FX_TYPE_GAS");
break;
case FX_TYPE_FLAMES:
NewFX=new ("FXFlames") CFXBaseAnim();
NewFX=new ("FXFlames") CFXFire();
NewFX->setBaseData(&FXFireBaseData);
break;

1
source/fx/fxbaseanim.cpp
View file

@ -87,7 +87,6 @@ int ThisFrame=CurrentFrame>>BaseData->FrameShift;
}
/*****************************************************************************/
/*****************************************************************************/
/*** Render ******************************************************************/
/*****************************************************************************/

19
source/fx/fxfire.h
View file

@ -1,21 +1,22 @@
/*****************/
/*** Bubble FX ***/
/*****************/
/***************/
/*** Fire FX ***/
/***************/
#ifndef __FX_FX_BUBBLE_HEADER__
#define __FX_FX_BUBBLE_HEADER__
#ifndef __FX_FX_FIRE_HEADER__
#define __FX_FX_FIRE_HEADER__
#include "fx/fxbaseanim.h"
/*****************************************************************************/
class CFXBubble : public CFXBaseAnim
class CFXFire : public CFXBaseAnim
{
public:
void init(DVECTOR const &Pos);
void think(int _frames);
void render();
void SetSize(int W,int H) {SprW=W; SprH=H;}
protected:
u16 XIdx;
int SprW,SprH;
};
#endif