mirror of https://github.com/OpenTTD/OpenTTD.git
Cleanup: Remove unused GetUnicodeGlyph()
This commit is contained in:
parent
2cdd8b7429
commit
b00e18fe9f
|
@ -71,13 +71,6 @@ public:
|
||||||
*/
|
*/
|
||||||
virtual int GetFontSize() const { return this->height; }
|
virtual int GetFontSize() const { return this->height; }
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the SpriteID mapped to the given key
|
|
||||||
* @param key The key to get the sprite for.
|
|
||||||
* @return The sprite.
|
|
||||||
*/
|
|
||||||
virtual SpriteID GetUnicodeGlyph(WChar key) = 0;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Map a SpriteID to the key
|
* Map a SpriteID to the key
|
||||||
* @param key The key to map to.
|
* @param key The key to map to.
|
||||||
|
@ -166,12 +159,6 @@ public:
|
||||||
virtual bool IsBuiltInFont() = 0;
|
virtual bool IsBuiltInFont() = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Get the SpriteID mapped to the given font size and key */
|
|
||||||
static inline SpriteID GetUnicodeGlyph(FontSize size, WChar key)
|
|
||||||
{
|
|
||||||
return FontCache::Get(size)->GetUnicodeGlyph(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Map a SpriteID to the font size and key */
|
/** Map a SpriteID to the font size and key */
|
||||||
static inline void SetUnicodeGlyph(FontSize size, WChar key, SpriteID sprite)
|
static inline void SetUnicodeGlyph(FontSize size, WChar key, SpriteID sprite)
|
||||||
{
|
{
|
||||||
|
|
|
@ -17,12 +17,12 @@
|
||||||
class SpriteFontCache : public FontCache {
|
class SpriteFontCache : public FontCache {
|
||||||
private:
|
private:
|
||||||
SpriteID **glyph_to_spriteid_map; ///< Mapping of glyphs to sprite IDs.
|
SpriteID **glyph_to_spriteid_map; ///< Mapping of glyphs to sprite IDs.
|
||||||
|
SpriteID GetUnicodeGlyph(WChar key);
|
||||||
|
|
||||||
void ClearGlyphToSpriteMap();
|
void ClearGlyphToSpriteMap();
|
||||||
public:
|
public:
|
||||||
SpriteFontCache(FontSize fs);
|
SpriteFontCache(FontSize fs);
|
||||||
~SpriteFontCache();
|
~SpriteFontCache();
|
||||||
virtual SpriteID GetUnicodeGlyph(WChar key);
|
|
||||||
virtual void SetUnicodeGlyph(WChar key, SpriteID sprite);
|
virtual void SetUnicodeGlyph(WChar key, SpriteID sprite);
|
||||||
virtual void InitializeUnicodeGlyphMap();
|
virtual void InitializeUnicodeGlyphMap();
|
||||||
virtual void ClearFontCache();
|
virtual void ClearFontCache();
|
||||||
|
|
|
@ -63,7 +63,6 @@ public:
|
||||||
TrueTypeFontCache(FontSize fs, int pixels);
|
TrueTypeFontCache(FontSize fs, int pixels);
|
||||||
virtual ~TrueTypeFontCache();
|
virtual ~TrueTypeFontCache();
|
||||||
int GetFontSize() const override { return this->used_size; }
|
int GetFontSize() const override { return this->used_size; }
|
||||||
SpriteID GetUnicodeGlyph(WChar key) override { return this->parent->GetUnicodeGlyph(key); }
|
|
||||||
void SetUnicodeGlyph(WChar key, SpriteID sprite) override { this->parent->SetUnicodeGlyph(key, sprite); }
|
void SetUnicodeGlyph(WChar key, SpriteID sprite) override { this->parent->SetUnicodeGlyph(key, sprite); }
|
||||||
void InitializeUnicodeGlyphMap() override { this->parent->InitializeUnicodeGlyphMap(); }
|
void InitializeUnicodeGlyphMap() override { this->parent->InitializeUnicodeGlyphMap(); }
|
||||||
const Sprite *GetGlyph(GlyphID key) override;
|
const Sprite *GetGlyph(GlyphID key) override;
|
||||||
|
|
Loading…
Reference in New Issue