index b9ff8bb8416099d488c03a3c22cc39cfa4db17f2..a7a01676b190617fff622c5addf09d72998e9613 100644 (file)
{$IFDEF ENABLE_HOLMES}
g_holmes,
{$ENDIF}
{$IFDEF ENABLE_HOLMES}
g_holmes,
{$ENDIF}
- r_playermodel, r_graphics
+ r_playermodel, r_graphics, r_animations
;
procedure r_Player_DrawAll;
;
procedure r_Player_DrawAll;
if p.PunchAnim <> nil then
begin
if p.PunchAnim <> nil then
begin
- p.PunchAnim.Draw(fX + IfThen(p.Direction = TDirection.D_LEFT, 15 - p.Obj.Rect.X, p.Obj.Rect.X - 15), fY + fSlope + p.Obj.Rect.Y - 11, Mirror);
+ r_Animation_Draw(p.PunchAnim, fX + IfThen(p.Direction = TDirection.D_LEFT, 15 - p.Obj.Rect.X, p.Obj.Rect.X - 15), fY + fSlope + p.Obj.Rect.Y - 11, Mirror);
if p.PunchAnim.played then
begin
p.PunchAnim.Free;
if p.PunchAnim.played then
begin
p.PunchAnim.Free;
p.Obj.lerp(gLerpFactor, fX, fY);
if p.Animation <> nil then
p.Obj.lerp(gLerpFactor, fX, fY);
if p.Animation <> nil then
- p.Animation.Draw(fX, fY, TMirrorType.None);
+ r_Animation_Draw(p.Animation, fX, fY, TMirrorType.None);
if p.AnimationMask <> nil then
begin
e_Colors := p.Color;
if p.AnimationMask <> nil then
begin
e_Colors := p.Color;
- p.AnimationMask.Draw(fX, fY, TMirrorType.None);
+ r_Animation_Draw(p.AnimationMask, fX, fY, TMirrorType.None);
e_Colors.R := 255;
e_Colors.G := 255;
e_Colors.B := 255;
e_Colors.R := 255;
e_Colors.G := 255;
e_Colors.B := 255;