This commit is contained in:
Daveo 2001-08-14 17:07:48 +00:00
parent fb2681fe0c
commit d54e0f3e2f
2 changed files with 3 additions and 3 deletions

View File

@ -694,13 +694,13 @@ int HalfW=BBoxW>>1;
static const VECTOR ZeroPos={0,0,0}; static const VECTOR ZeroPos={0,0,0};
static const int ScaleXAspect=2050; // Odd hard coded number, sorry static const int ScaleXAspect=2050; // Odd hard coded number, sorry
POLY_FT4 *CActorGfx::RotateScale(POLY_FT4 *Ft4,DVECTOR &Pos,int Angle,int XScale,int YScale) POLY_FT4 *CActorGfx::RotateScale(POLY_FT4 *Ft4,DVECTOR &Pos,int Angle,int XScale,int YScale,bool Force)
{ {
MATRIX Mtx; MATRIX Mtx;
VECTOR Scale; VECTOR Scale;
Angle&=4095; Angle&=4095;
if (Angle==0 && XScale==ONE && YScale==ONE) return(Ft4); if (Angle==0 && XScale==ONE && YScale==ONE && !Force) return(Ft4);
Scale.vx=XScale; Scale.vx=XScale;
Scale.vy=YScale; Scale.vy=YScale;

View File

@ -136,7 +136,7 @@ virtual ~CActorGfx();
void setActor(sActorPool *ThisActor); void setActor(sActorPool *ThisActor);
POLY_FT4 *Render(DVECTOR &Pos,int Anim,int Frame,bool FlipX=false,bool FlipY=false); POLY_FT4 *Render(DVECTOR &Pos,int Anim,int Frame,bool FlipX=false,bool FlipY=false);
POLY_FT4 *RotateScale(POLY_FT4 *Ft4,DVECTOR &Pos,int Angle,int XScale,int YScale); POLY_FT4 *RotateScale(POLY_FT4 *Ft4,DVECTOR &Pos,int Angle,int XScale,int YScale,bool Force=false);
void getFrameOffsets(int _anim,int _frame,int *_x,int *_y); void getFrameOffsets(int _anim,int _frame,int *_x,int *_y);
int getFrameCount(int Anim) {return(PoolEntry->ActorGfx->AnimList[Anim].FrameCount);} int getFrameCount(int Anim) {return(PoolEntry->ActorGfx->AnimList[Anim].FrameCount);}