Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Daveo 2001-05-23 19:27:05 +00:00
parent 3ad26cb392
commit dff59d4f33
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/fx/fx.cpp
View File

@ -15,6 +15,7 @@
#include "FX\FXjfish.h" #include "FX\FXjfish.h"
#include "FX\FXfallingTile.h" #include "FX\FXfallingTile.h"
#include "FX\FXSteam.h" #include "FX\FXSteam.h"
#include "FX\FXSplash.h"
/* FX /* FX
Jellyfish legs Jellyfish legs
@ -63,7 +64,9 @@ Level Effect Emitters
*/ */
/*****************************************************************************/ /*****************************************************************************/
/*
CFXSteam *TestFXPtr=0; CFXSteam *TestFXPtr=0;
void TestFX(DVECTOR Pos) void TestFX(DVECTOR Pos)
{ {
@ -79,6 +82,13 @@ void TestFX(DVECTOR Pos)
TestFXPtr=0; TestFXPtr=0;
} }
} }
*/
/*****************************************************************************/
void TestFX(DVECTOR Pos)
{
CFX::Create(CFX::FX_TYPE_SPLASH,Pos);
// TestFXPtr->setLife(32);
}
/*****************************************************************************/ /*****************************************************************************/
CFX *CFX::Create(const FX_TYPE Type) CFX *CFX::Create(const FX_TYPE Type)
@ -88,12 +98,14 @@ CFX *NewFX;
switch(Type) switch(Type)
{ {
case FX_TYPE_FALLINGTILE: case FX_TYPE_FALLINGTILE:
NewFX=new ("Falling Tile") CFXFallingTile(); NewFX=new ("FXFalling Tile") CFXFallingTile();
break; break;
case FX_TYPE_STEAM: case FX_TYPE_STEAM:
NewFX=new ("Steam") CFXSteam(); NewFX=new ("FXSteam") CFXSteam();
break;
case FX_TYPE_SPLASH:
NewFX=new ("FXSplash") CFXSplash();
break; break;
case FX_TYPE_JELLYFISH_LEGS: case FX_TYPE_JELLYFISH_LEGS:
// NewFX=new ("JellyFish Legs") CFXJellyFishLegs(); // NewFX=new ("JellyFish Legs") CFXJellyFishLegs();
ASSERT(!"FISH LEGS OUT OF STOCK\n"); ASSERT(!"FISH LEGS OUT OF STOCK\n");
@ -114,7 +126,6 @@ CFX *NewFX;
case FX_TYPE_DROP_ACID: case FX_TYPE_DROP_ACID:
case FX_TYPE_DROP_LAVA: case FX_TYPE_DROP_LAVA:
case FX_TYPE_DROP_OIL: case FX_TYPE_DROP_OIL:
case FX_TYPE_SPLASH:
case FX_TYPE_SPLASH_WATER: case FX_TYPE_SPLASH_WATER:
case FX_TYPE_SPLASH_ACID: case FX_TYPE_SPLASH_ACID:
case FX_TYPE_SPLASH_LAVA: case FX_TYPE_SPLASH_LAVA:

3
source/fx/fxsteam.cpp
View File

@ -12,7 +12,7 @@
#include "FX\FXSteam.h" #include "FX\FXSteam.h"
static const int DefSize=4; static const int DefSize=4*ONE;
static const int DefAngleInc=999; static const int DefAngleInc=999;
static const int DefShadeBase=255; static const int DefShadeBase=255;
static const int DefShadeDec=8; static const int DefShadeDec=8;
@ -40,6 +40,7 @@ void CFXSteam::shutdown()
/*****************************************************************************/ /*****************************************************************************/
void CFXSteam::SetSize(int Size) void CFXSteam::SetSize(int Size)
{ {
Size>>=12;
ScaleInc=(4096/LIST_SIZE)*Size; ScaleInc=(4096/LIST_SIZE)*Size;
BaseVel.vx=0; BaseVel.vx=0;
BaseVel.vy=-Size; BaseVel.vy=-Size;