From ef8fd472a8d1e2996828b0d5184e87d14254d527 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 3 Sep 2023 19:52:53 +0200 Subject: [PATCH] - fixed bad virtual override in FSheetTexture. --- src/common/fonts/font.cpp | 2 +- src/common/fonts/hexfont.cpp | 4 ++-- src/common/textures/formats/startscreentexture.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/fonts/font.cpp b/src/common/fonts/font.cpp index ed7b871c2..8b1542898 100644 --- a/src/common/fonts/font.cpp +++ b/src/common/fonts/font.cpp @@ -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); diff --git a/src/common/fonts/hexfont.cpp b/src/common/fonts/hexfont.cpp index 3fb02004b..3ec2816e6 100644 --- a/src/common/fonts/hexfont.cpp +++ b/src/common/fonts/hexfont.cpp @@ -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; }; diff --git a/src/common/textures/formats/startscreentexture.cpp b/src/common/textures/formats/startscreentexture.cpp index f19a654f9..155bae19b 100644 --- a/src/common/textures/formats/startscreentexture.cpp +++ b/src/common/textures/formats/startscreentexture.cpp @@ -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;