OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master' into merge-gzdoom

Browse source
This commit is contained in:
Magnus Norddahl 2023-10-19 21:05:17 +02:00
commit e75e5a387b
600 changed files with 40006 additions and 59374 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/common/fonts/ttffont.cpp
View file

@ -24,7 +24,7 @@ public:
Palette = palette;
}
PalettedPixels CreatePalettedPixels(int conversion) override
PalettedPixels CreatePalettedPixels(int conversion, int frame = 0) override
{
PalettedPixels OutPixels(Pixels.Size());
memcpy(OutPixels.Data(), Pixels.Data(), Pixels.Size());
@ -51,13 +51,13 @@ class FTTFFont : public FFont
public:
FTTFFont(const char* fontname, int height, int lump) : FFont(lump)
{
auto lumpdata = fileSystem.GetFileData(lump);
auto lumpdata = fileSystem.ReadFile(lump);
SFT sft = {};
sft.xScale = height;
sft.yScale = height;
sft.flags = SFT_DOWNWARD_Y;
sft.font = sft_loadmem(lumpdata.Data(), lumpdata.Size());
sft.font = sft_loadmem(lumpdata.GetBytes(), lumpdata.GetSize());
if (!sft.font)
I_FatalError("Could not load truetype font file");