zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 05:51:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed bad virtual override in FSheetTexture.

Browse source
This commit is contained in:
Christoph Oelckers 2023-09-03 19:52:53 +02:00
parent 351e0d7ed9
commit ef8fd472a8
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/fonts/font.cpp
View file

@ -390,7 +390,7 @@ public:
Y = y;
}
int CopyPixels(FBitmap* dest, int conversion)
int CopyPixels(FBitmap* dest, int conversion, int frame = 0) override
{
auto& pic = sheetBitmaps[baseSheet];
dest->CopyPixelDataRGB(0, 0, pic.GetPixels() + 4 * (X + pic.GetWidth() * Y), Width, Height, 4, pic.GetWidth() * 4, 0, CF_BGRA);

4
src/common/fonts/hexfont.cpp
View file

@ -110,7 +110,7 @@ public:
FHexFontChar(uint8_t *sourcedata, int swidth, int width, int height);
PalettedPixels CreatePalettedPixels(int conversion, int frame = 0) override;
int CopyPixels(FBitmap* bmp, int conversion, int frame = 0);
int CopyPixels(FBitmap* bmp, int conversion, int frame = 0) override;
protected:
int SourceWidth;
@ -191,7 +191,7 @@ public:
FHexFontChar2(uint8_t *sourcedata, int swidth, int width, int height);
PalettedPixels CreatePalettedPixels(int conversion, int frame = 0) override;
int CopyPixels(FBitmap* bmp, int conversion, int frame = 0);
int CopyPixels(FBitmap* bmp, int conversion, int frame = 0) override;
};

2
src/common/textures/formats/startscreentexture.cpp
View file

@ -60,7 +60,7 @@ public:
Height = srcdata.GetHeight();
bUseGamePalette = false;
}
int CopyPixels(FBitmap* bmp, int conversion, int frame = 0)
int CopyPixels(FBitmap* bmp, int conversion, int frame = 0) override
{
bmp->Blit(0, 0, info);
return 0;