mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-28 06:53:58 +00:00
- fixed: The texture scale wasn't copied to image based font characters.
This commit is contained in:
parent
c597b16f30
commit
6342e85c26
2 changed files with 4 additions and 10 deletions
|
@ -298,7 +298,8 @@ class FTexture
|
|||
friend class FMultiPatchTexture;
|
||||
friend class FSkyBox;
|
||||
friend class FBrightmapTexture;
|
||||
friend class FFontChar1;
|
||||
friend class FFont;
|
||||
friend class FSpecialFont;
|
||||
friend void RecordTextureColors (FTexture *pic, uint8_t *usedcolors);
|
||||
|
||||
|
||||
|
@ -492,15 +493,6 @@ protected:
|
|||
|
||||
FTexture (const char *name = NULL, int lumpnum = -1);
|
||||
|
||||
void CopyInfo(FTexture *other)
|
||||
{
|
||||
CopySize(other);
|
||||
bNoDecals = other->bNoDecals;
|
||||
Rotations = other->Rotations;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public:
|
||||
FTextureBuffer CreateTexBuffer(int translation, int flags = 0);
|
||||
bool GetTranslucency();
|
||||
|
|
|
@ -385,6 +385,7 @@ FFont::FFont (const char *name, const char *nametemplate, int first, int count,
|
|||
{
|
||||
Chars[i].OriginalPic = charLumps[i];
|
||||
Chars[i].TranslatedPic = new FImageTexture(new FFontChar1 (charLumps[i]->GetImage()), "");
|
||||
Chars[i].TranslatedPic->Scale = charLumps[i]->Scale;
|
||||
TexMan.AddTexture(Chars[i].TranslatedPic);
|
||||
}
|
||||
else Chars[i].TranslatedPic = charLumps[i];
|
||||
|
@ -1546,6 +1547,7 @@ FSpecialFont::FSpecialFont (const char *name, int first, int count, FTexture **l
|
|||
if (!noTranslate)
|
||||
{
|
||||
Chars[i].TranslatedPic = new FImageTexture(new FFontChar1 (charlumps[i]->GetImage()), "");
|
||||
Chars[i].TranslatedPic->Scale = charlumps[i]->Scale;
|
||||
TexMan.AddTexture(Chars[i].TranslatedPic);
|
||||
}
|
||||
else Chars[i].TranslatedPic = charlumps[i];
|
||||
|
|
Loading…
Reference in a new issue