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-05-25 18:43:47 +00:00
parent 5b785068c2
commit fa5105d783
96 changed files with 550 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/fx/fx.cpp
View file

@ -101,6 +101,8 @@ CFX *CFX::Create(const FX_TYPE Type)
{
CFX *NewFX;
NewFX = (CFX*)CThingManager::GetThing(CThing::TYPE_FX,Type);
if (!NewFX)
switch(Type)
{
case FX_TYPE_FALLINGTILE:
@ -161,7 +163,7 @@ CFX *NewFX;
ASSERT(!"UNKNOWN FX TYPE");
return NULL;
}
NewFX->setThingSubType(Type);
return NewFX;
}
@ -194,9 +196,6 @@ CFX *NewFX=CFX::Create(Type);
void CFX::init()
{
CFXThing::init();
m_spriteBank=new ("FX Sprite") SpriteBank();
m_spriteBank->load(SPRITES_SPRITES_SPR);
OtPos=OTPOS__ACTOR_POS;
Life=-1;
@ -205,7 +204,6 @@ void CFX::init()
/*****************************************************************************/
void CFX::shutdown()
{
m_spriteBank->dump(); delete m_spriteBank;
CFXThing::shutdown();
}

7
source/fx/fx.h
View file

@ -8,7 +8,6 @@
#include "thing/thing.h"
/*****************************************************************************/
class SpriteBank;
class CFX : public CFXThing
{
public:
@ -47,6 +46,11 @@ public:
FX_TYPE_FLAMES,
FX_TYPE_EXPLODE,
FX_TYPE_DEBRIS,
FX_TYPE_MAX
};
enum
{ // For Dynamic ThingCache
MAX_SUBTYPE =FX_TYPE_MAX,
};
static CFX *Create(const FX_TYPE Type);
@ -65,7 +69,6 @@ virtual void setDie() {DieOut=true;}
virtual void setLife(int L) {Life=L;}
protected:
SpriteBank *m_spriteBank;
s32 OtPos;
u8 DieOut;

6
source/fx/fxbaseanim.cpp
View file

@ -9,7 +9,7 @@
#include "gfx\sprbank.h"
#include <sprites.h>
#include "level\level.h"
#include "game\game.h"
#include "FX\FXBaseAnim.h"
@ -58,11 +58,11 @@ void CFXBaseAnim::render()
CFX::render();
if (!canRender() || isSetToShutdown()) return;
SpriteBank *SprBank=CGameScene::getSpriteBank();
DVECTOR &RenderPos=getRenderPos();
int ThisFrame=Frame>>FrameShift;
POLY_FT4 *Ft4=m_spriteBank->printFT4Scaled(BaseFrame+ThisFrame,RenderPos.vx,RenderPos.vy,0,0,OtPos*0,Scale>>4);
POLY_FT4 *Ft4=SprBank->printFT4Scaled(BaseFrame+ThisFrame,RenderPos.vx,RenderPos.vy,0,0,OtPos*0,Scale>>4);
Ft4->u1--; Ft4->u3--;
Ft4->v2--; Ft4->v3--;
setRGB0(Ft4,R,G,B);

5
source/fx/fxbasetrail.cpp
View file

@ -9,6 +9,7 @@
#include "gfx\sprbank.h"
#include <sprites.h>
#include "level\level.h"
#include "game\game.h"
#include "FX\FXBaseTrail.h"
@ -65,7 +66,7 @@ void CFXBaseTrail::render()
if (canRender())
{
DVECTOR RenderPos=getRenderPos();
SpriteBank *SprBank=CGameScene::getSpriteBank();
int ThisIdx=HeadIdx;
int StartY=RenderPos.vy;
@ -78,7 +79,7 @@ void CFXBaseTrail::render()
RenderPos.vy+=ThisElem.Ofs.vy>>2;
if (ThisElem.Shade)
{
Ft4=m_spriteBank->printRotatedScaledSprite(ThisElem.Frame,RenderPos.vx,RenderPos.vy,ThisElem.Scale,ThisElem.Scale,ThisElem.Angle,OtPos*0);
Ft4=SprBank->printRotatedScaledSprite(ThisElem.Frame,RenderPos.vx,RenderPos.vy,ThisElem.Scale,ThisElem.Scale,ThisElem.Angle,OtPos*0);
setShadeTex(Ft4,0);
setRGB0(Ft4,ThisElem.Shade,ThisElem.Shade,ThisElem.Shade);
setSemiTrans(Ft4,1);

3
source/fx/fxjfish.cpp
View file

@ -72,7 +72,6 @@ int AInc=1024/Width;
if (dH>8) dH=8;
if (dH<2) dH=2;
HeightTable[H]=(s16)dH;
// printf("%i %i =%i\n",H,Ofs,HeightTable[H]);
}
*/
}
@ -144,7 +143,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,OtPos);
POLY_FT4 *Ft4=CGameScene::getSpriteBank()->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;