zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-12-03 17:32:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- a few more fixes.

Browse source
This commit is contained in:
Christoph Oelckers 2018-12-16 00:37:34 +01:00
parent 87b0567cd7
commit 51f03c8215
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/textures/skyboxtexture.cpp
View file

@ -38,6 +38,7 @@ FSkyBox::FSkyBox(const char *name)
: FTexture(name) : FTexture(name)
{ {
FTextureID texid = TexMan.CheckForTexture(name, ETextureType::Wall); FTextureID texid = TexMan.CheckForTexture(name, ETextureType::Wall);
previous = nullptr;
if (texid.isValid()) if (texid.isValid())
{ {
previous = TexMan.GetTexture(texid); previous = TexMan.GetTexture(texid);

5
src/v_font.cpp
View file

@ -149,7 +149,7 @@ public:
FSinglePicFont(const char *picname); FSinglePicFont(const char *picname);
// FFont interface // FFont interface
FTexture *GetChar (int code, int *const width) const; FTexture *GetChar(int code, int translation, int *const width, bool *redirected = nullptr) const override;
int GetCharWidth (int code) const; int GetCharWidth (int code) const;
protected: protected:
@ -1465,9 +1465,10 @@ FSinglePicFont::FSinglePicFont(const char *picname) :
// //
//========================================================================== //==========================================================================
FTexture *FSinglePicFont::GetChar (int code, int *const width) const FTexture *FSinglePicFont::GetChar (int code, int translation, int *const width, bool *redirected) const
{ {
*width = SpaceWidth; *width = SpaceWidth;
if (redirected) *redirected = false;
if (code == 'a' || code == 'A') if (code == 'a' || code == 'A')
{ {
return TexMan.GetPalettedTexture(PicNum, true); return TexMan.GetPalettedTexture(PicNum, true);

2
src/v_font.h
View file

@ -82,7 +82,7 @@ public:
FFont (const char *fontname, const char *nametemplate, int first, int count, int base, int fdlump, int spacewidth=-1, bool notranslate = false); FFont (const char *fontname, const char *nametemplate, int first, int count, int base, int fdlump, int spacewidth=-1, bool notranslate = false);
virtual ~FFont (); virtual ~FFont ();
FTexture *GetChar (int code, int translation, int *const width, bool *redirected = nullptr) const; virtual FTexture *GetChar (int code, int translation, int *const width, bool *redirected = nullptr) const;
virtual int GetCharWidth (int code) const; virtual int GetCharWidth (int code) const;
FRemapTable *GetColorTranslation (EColorRange range, PalEntry *color = nullptr) const; FRemapTable *GetColorTranslation (EColorRange range, PalEntry *color = nullptr) const;
int GetLump() const { return Lump; } int GetLump() const { return Lump; }