OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- changed translation management so that the fonts also use translation IDs.

Browse source
This commit is contained in:
Christoph Oelckers 2020-03-16 17:23:30 +01:00
commit 828cba13a1
17 changed files with 63 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/rendering/2d/v_draw.cpp
View file

@ -558,7 +558,7 @@ bool DFrameBuffer::ParseDrawTextureTags(FTexture *img, double x, double y, uint3
parms->destheight = INT_MAX;
parms->Alpha = 1.f;
parms->fillcolor = -1;
parms->remap = NULL;
parms->TranslationId = -1;
parms->colorOverlay = 0;
parms->alphaChannel = false;
parms->flipX = false;
@ -756,7 +756,7 @@ bool DFrameBuffer::ParseDrawTextureTags(FTexture *img, double x, double y, uint3
break;
case DTA_TranslationIndex:
parms->remap = TranslationToTable(ListGetInt(tags));
parms->TranslationId = ListGetInt(tags);
break;
case DTA_ColorOverlay:
@ -971,11 +971,6 @@ bool DFrameBuffer::ParseDrawTextureTags(FTexture *img, double x, double y, uint3
}
ListEnd(tags);
if (parms->remap != nullptr && parms->remap->Inactive)
{ // If it's inactive, pretend we were passed NULL instead.
parms->remap = nullptr;
}
// intersect with the canvas's clipping rectangle.
if (clipwidth >= 0 && clipheight >= 0)
{