From 9c50600286b643c9be17ce2521f61d5b3b7c9cf1 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sun, 5 Feb 2017 00:53:36 -0500 Subject: [PATCH] - fix compile errors --- src/polyrenderer/scene/poly_playersprite.cpp | 5 +++-- src/swrenderer/things/r_playersprite.cpp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/polyrenderer/scene/poly_playersprite.cpp b/src/polyrenderer/scene/poly_playersprite.cpp index 2bd8f2f65a..339d3051a4 100644 --- a/src/polyrenderer/scene/poly_playersprite.cpp +++ b/src/polyrenderer/scene/poly_playersprite.cpp @@ -358,6 +358,7 @@ void RenderPolyPlayerSprites::RenderSprite(DPSprite *sprite, AActor *owner, floa screenSprite.Width = tex->GetWidth() * xscale; screenSprite.Height = tex->GetHeight() * yscale; screenSprite.Translation = TranslationToTable(translation); + //screenSprite.Translation = translation; screenSprite.Flip = xiscale < 0; screenSprite.Alpha = Alpha; screenSprite.RenderStyle = RenderStyle; @@ -426,7 +427,7 @@ void PolyScreenSprite::Render() Y1, DTA_DestWidthF, Width, DTA_DestHeightF, Height, - DTA_Translation, Translation, + DTA_TranslationIndex, Translation, DTA_FlipX, Flip, DTA_TopOffset, 0, DTA_LeftOffset, 0, @@ -434,7 +435,7 @@ void PolyScreenSprite::Render() DTA_ClipTop, viewwindowy, DTA_ClipRight, viewwindowx + viewwidth, DTA_ClipBottom, viewwindowy + viewheight, - DTA_AlphaF, Alpha, + DTA_Alpha, Alpha, DTA_RenderStyle, RenderStyle, DTA_FillColor, FillColor, DTA_SpecialColormap, special, diff --git a/src/swrenderer/things/r_playersprite.cpp b/src/swrenderer/things/r_playersprite.cpp index a2e8acec30..468355095f 100644 --- a/src/swrenderer/things/r_playersprite.cpp +++ b/src/swrenderer/things/r_playersprite.cpp @@ -561,7 +561,7 @@ namespace swrenderer viewwindowy + viewheight / 2 - sprite.texturemid * sprite.yscale - 0.5, DTA_DestWidthF, FIXED2DBL(sprite.pic->GetWidth() * sprite.xscale), DTA_DestHeightF, sprite.pic->GetHeight() * sprite.yscale, - DTA_Translation, TranslationToTable(sprite.Translation), + DTA_TranslationIndex, sprite.Translation, DTA_FlipX, sprite.flip, DTA_TopOffset, 0, DTA_LeftOffset, 0, @@ -569,7 +569,7 @@ namespace swrenderer DTA_ClipTop, viewwindowy, DTA_ClipRight, viewwindowx + viewwidth, DTA_ClipBottom, viewwindowy + viewheight, - DTA_AlphaF, sprite.Alpha, + DTA_Alpha, sprite.Alpha, DTA_RenderStyle, sprite.RenderStyle, DTA_FillColor, sprite.FillColor, DTA_SpecialColormap, sprite.special,