zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 08:31:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The texture scale wasn't copied to image based font characters.

Browse source
This commit is contained in:
Christoph Oelckers 2018-12-18 19:52:56 +01:00
parent c597b16f30
commit 6342e85c26
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/textures/textures.h
View file

@ -298,7 +298,8 @@ class FTexture
friend class FMultiPatchTexture; friend class FMultiPatchTexture;
friend class FSkyBox; friend class FSkyBox;
friend class FBrightmapTexture; friend class FBrightmapTexture;
friend class FFontChar1; friend class FFont;
friend class FSpecialFont;
friend void RecordTextureColors (FTexture *pic, uint8_t *usedcolors); friend void RecordTextureColors (FTexture *pic, uint8_t *usedcolors);
@ -492,15 +493,6 @@ protected:
FTexture (const char *name = NULL, int lumpnum = -1); FTexture (const char *name = NULL, int lumpnum = -1);
void CopyInfo(FTexture *other)
{
CopySize(other);
bNoDecals = other->bNoDecals;
Rotations = other->Rotations;
}
public: public:
FTextureBuffer CreateTexBuffer(int translation, int flags = 0); FTextureBuffer CreateTexBuffer(int translation, int flags = 0);
bool GetTranslucency(); bool GetTranslucency();

2
src/v_font.cpp
View file

@ -385,6 +385,7 @@ FFont::FFont (const char *name, const char *nametemplate, int first, int count,
{ {
Chars[i].OriginalPic = charLumps[i]; Chars[i].OriginalPic = charLumps[i];
Chars[i].TranslatedPic = new FImageTexture(new FFontChar1 (charLumps[i]->GetImage()), ""); Chars[i].TranslatedPic = new FImageTexture(new FFontChar1 (charLumps[i]->GetImage()), "");
Chars[i].TranslatedPic->Scale = charLumps[i]->Scale;
TexMan.AddTexture(Chars[i].TranslatedPic); TexMan.AddTexture(Chars[i].TranslatedPic);
} }
else Chars[i].TranslatedPic = charLumps[i]; else Chars[i].TranslatedPic = charLumps[i];
@ -1546,6 +1547,7 @@ FSpecialFont::FSpecialFont (const char *name, int first, int count, FTexture **l
if (!noTranslate) if (!noTranslate)
{ {
Chars[i].TranslatedPic = new FImageTexture(new FFontChar1 (charlumps[i]->GetImage()), ""); Chars[i].TranslatedPic = new FImageTexture(new FFontChar1 (charlumps[i]->GetImage()), "");
Chars[i].TranslatedPic->Scale = charlumps[i]->Scale;
TexMan.AddTexture(Chars[i].TranslatedPic); TexMan.AddTexture(Chars[i].TranslatedPic);
} }
else Chars[i].TranslatedPic = charlumps[i]; else Chars[i].TranslatedPic = charlumps[i];