From 3491182ac309d394331568e155584d58fb5fed99 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 7 Dec 2018 02:21:39 +0100 Subject: [PATCH] - fixed compilation --- src/g_statusbar/sbarinfo.cpp | 1 - src/swrenderer/textures/warptexture.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/g_statusbar/sbarinfo.cpp b/src/g_statusbar/sbarinfo.cpp index 34cf09c3c..aade1b1f9 100644 --- a/src/g_statusbar/sbarinfo.cpp +++ b/src/g_statusbar/sbarinfo.cpp @@ -1190,7 +1190,6 @@ public: { if (forceWidth < 0) dx -= (texture->GetDisplayWidthDouble()/2.0)-texture->GetDisplayLeftOffsetDouble(); else dx -= forceWidth*(0.5-(texture->GetDisplayLeftOffsetDouble()/texture->GetDisplayWidthDouble())); - //Unoptimalized ^^formula is dx -= forceWidth/2.0-(texture->GetScaledLeftOffsetDouble()*forceWidth/texture->GetDisplayWidthDouble()); if (forceHeight < 0) dy -= (texture->GetDisplayHeightDouble()/2.0)-texture->GetDisplayTopOffsetDouble(); else dy -= forceHeight*(0.5-(texture->GetDisplayTopOffsetDouble()/texture->GetDisplayHeightDouble())); diff --git a/src/swrenderer/textures/warptexture.cpp b/src/swrenderer/textures/warptexture.cpp index 41f563ed4..294bf694f 100644 --- a/src/swrenderer/textures/warptexture.cpp +++ b/src/swrenderer/textures/warptexture.cpp @@ -57,7 +57,7 @@ bool FWarpTexture::CheckModified (FRenderStyle style) const uint32_t *FWarpTexture::GetPixelsBgra() { auto Pixels = GetPixels(DefaultRenderStyle()); - if (PixelsBgra.empty() || GenTime[0] != GenTimeBgra) + if (PixelsBgra.Size() == 0 || GenTime[0] != GenTimeBgra) { CreatePixelsBgraWithMipmaps(); for (int i = 0; i < GetWidth() * GetHeight(); i++) @@ -70,7 +70,7 @@ const uint32_t *FWarpTexture::GetPixelsBgra() GenerateBgraMipmapsFast(); GenTimeBgra = GenTime[0]; } - return PixelsBgra.data(); + return PixelsBgra.Data(); }