diff --git a/source/gfx/actor.cpp b/source/gfx/actor.cpp index c124f04f1..7777ae79a 100644 --- a/source/gfx/actor.cpp +++ b/source/gfx/actor.cpp @@ -87,20 +87,6 @@ u16 ThisFrame=ThisAnim->Anim[Frame]; return(SpriteBank->FrameList+ThisFrame); } -/*****************************************************************************/ -int CActorGfx::getFrameWidth(int Anim,int Frame) -{ -sSpriteFrame *ThisFrame=GetFrame(Anim,Frame); - return(ThisFrame->W); -} - -/*****************************************************************************/ -int CActorGfx::getFrameHeight(int Anim,int Frame) -{ -sSpriteFrame *ThisFrame=GetFrame(Anim,Frame); - return(ThisFrame->H); -} - /*****************************************************************************/ POLY_FT4 *CActorGfx::Render(DVECTOR &Pos,int Anim,int Frame,bool XFlip,bool YFlip,bool Shadow) { @@ -152,6 +138,8 @@ int H=ThisFrame->H; Ft4->u1=U; Ft4->u2=U+W-1; Ft4->u3=U; + X-=ThisFrame->XOfs; + X-=ThisFrame->W/2; } else { @@ -159,6 +147,7 @@ int H=ThisFrame->H; Ft4->u1=U+W; Ft4->u2=U; Ft4->u3=U+W; + X+=ThisFrame->XOfs; } if (YFlip) @@ -167,6 +156,8 @@ int H=ThisFrame->H; Ft4->v1=V+H-1; Ft4->v2=V; Ft4->v3=V; + Y-=ThisFrame->YOfs; + Y-=ThisFrame->H/2; } else { @@ -174,11 +165,9 @@ int H=ThisFrame->H; Ft4->v1=V; Ft4->v2=V+H; Ft4->v3=V+H; + Y+=ThisFrame->YOfs; } - X-=ThisFrame->XOfs; - Y-=ThisFrame->YOfs; - setXYWH(Ft4,X,Y,W,H); } diff --git a/source/gfx/actor.h b/source/gfx/actor.h index 5cf0b4a2e..8a4935f71 100644 --- a/source/gfx/actor.h +++ b/source/gfx/actor.h @@ -24,10 +24,8 @@ virtual ~CActorGfx(); void Dump(); int getFrameCount(int Anim) {return(SpriteBank->AnimList[Anim].FrameCount);} - int getFrameWidth(int Anim,int Frame); - int getFrameHeight(int Anim,int Frame); - FileEquate GetFilename() {return(Filename);} + private: void SetUpFT4(POLY_FT4 *Ft4,sSpriteFrame *ThisFrame,int X,int Y,bool XFlip,bool YFlip); sSpriteFrame *GetFrame(int Anim,int Frame); diff --git a/tools/Data/bin/MkActor.exe b/tools/Data/bin/MkActor.exe index 85c0941b6..6b22bfcf4 100644 Binary files a/tools/Data/bin/MkActor.exe and b/tools/Data/bin/MkActor.exe differ