From 6342e85c26f7f1556ae42fb156404c9de7535e4e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 18 Dec 2018 19:52:56 +0100 Subject: [PATCH] - fixed: The texture scale wasn't copied to image based font characters. --- src/textures/textures.h | 12 ++---------- src/v_font.cpp | 2 ++ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/textures/textures.h b/src/textures/textures.h index 934fb122f..9fc9341b2 100644 --- a/src/textures/textures.h +++ b/src/textures/textures.h @@ -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(); diff --git a/src/v_font.cpp b/src/v_font.cpp index da3335236..a7b5f74f0 100644 --- a/src/v_font.cpp +++ b/src/v_font.cpp @@ -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];