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

Browse source
This commit is contained in:
Charles 2001-06-04 19:01:17 +00:00
parent 85f401edf0
commit 773d29ea89
16 changed files with 129 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/fx/fx.cpp
View file

@ -82,7 +82,7 @@ CFXBaseAnim::sFXAnim FXExplodeData=
CFXBaseAnim::sFXAnim FXFireData=
{
ONE << 1,
ONE,
FRM__FIRE01,FRM__FIRE06,
1,
127,127,127,

6
source/fx/fxbaseanim.cpp
View file

@ -19,7 +19,8 @@ void CFXBaseAnim::init(DVECTOR const &_Pos)
{
CFX::init(_Pos);
CurrentFrame=0;
CurrentScale=DataPtr->Scale;
CurrentScaleX=CurrentScaleY=DataPtr->Scale;
CurrentHeading = 0;
MaxFrame=((DataPtr->EndFrame-DataPtr->StartFrame)<<DataPtr->FrameShift)-1;
if (DataPtr->Flags & FXANIM_FLAG_LOOP)
{ // Looping Anim, so let it live forever!
@ -100,7 +101,8 @@ DVECTOR RenderPos;
SpriteBank *SprBank=CGameScene::getSpriteBank();
POLY_FT4 *Ft4=SprBank->printFT4Scaled(renderFrame,RenderPos.vx,RenderPos.vy,0,0,OtPos*0,CurrentScale>>4);
//POLY_FT4 *Ft4=SprBank->printFT4Scaled(renderFrame,RenderPos.vx,RenderPos.vy,0,0,OtPos*0,CurrentScale>>4);
POLY_FT4 *Ft4=SprBank->printRotatedScaledSprite(renderFrame,RenderPos.vx,RenderPos.vy,CurrentScaleX,CurrentScaleY,CurrentHeading,OtPos*0);
Ft4->u1--; Ft4->u3--;
Ft4->v2--; Ft4->v3--;
setShadeTex(Ft4,0);

9
source/fx/fxbaseanim.h
View file

@ -36,7 +36,10 @@ virtual void killFX();
void setData(void *Data) {DataPtr=(sFXAnim*)Data;}
virtual void SetScale(int S) {CurrentScale=S;}
virtual void SetScale(int S) {CurrentScaleX=CurrentScaleY=S;}
virtual void SetScaleX(int S) {CurrentScaleX=S;}
virtual void SetScaleY(int S) {CurrentScaleY=S;}
virtual void SetHeading(int H) {CurrentHeading=H;}
protected:
sFXAnim *DataPtr;
@ -44,7 +47,9 @@ protected:
s16 MaxFrame;
s16 CurrentFrame;
u16 renderFrame;
s16 CurrentScale;
s32 CurrentScaleX;
s32 CurrentScaleY;
s16 CurrentHeading;
};
#endif

2
source/fx/fxbubble.cpp
View file

@ -21,7 +21,7 @@ void CFXBubble::init(DVECTOR const &_Pos)
CFXBaseAnim::init(_Pos);
Life=32+getRndRange(63);
VelY=-getRndRange(4)-1;
CurrentScale=getRndRange(DataPtr->Scale/2)+(DataPtr->Scale/2);
CurrentScaleX=CurrentScaleY=getRndRange(DataPtr->Scale/2)+(DataPtr->Scale/2);
Die=0;
XIdx=getRnd()&15;