- fixed compilation

ZDoom · Dec 7, 2018 · 3491182 · 3491182
1 parent bde3558
commit 3491182
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/g_statusbar/sbarinfo.cpp b/src/g_statusbar/sbarinfo.cpp
@@ -1190,7 +1190,6 @@ class DSBarInfo
 		{
 			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
@@ -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();
 }