mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r27888) -Fix: Member access coding style (adf88)

release/1.8
frosch 2017-07-11 19:34:41 +00:00
parent 3eae9aba79
commit 64c5f00429
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fontcache.cpp
View File

@ -41,7 +41,7 @@ FontCache::FontCache(FontSize fs) : parent(FontCache::Get(fs)), fs(fs), height(_
ascender(_default_font_ascender[fs]), descender(_default_font_ascender[fs] - _default_font_height[fs]), ascender(_default_font_ascender[fs]), descender(_default_font_ascender[fs] - _default_font_height[fs]),
units_per_em(1) units_per_em(1)
{ {
assert(parent == NULL || this->fs == parent->fs); assert(this->parent == NULL || this->fs == this->parent->fs);
FontCache::caches[this->fs] = this; FontCache::caches[this->fs] = this;
Layouter::ResetFontCache(this->fs); Layouter::ResetFontCache(this->fs);
} }
@ -49,7 +49,7 @@ FontCache::FontCache(FontSize fs) : parent(FontCache::Get(fs)), fs(fs), height(_
/** Clean everything up. */ /** Clean everything up. */
FontCache::~FontCache() FontCache::~FontCache()
{ {
assert(this->fs == parent->fs); assert(this->fs == this->parent->fs);
FontCache::caches[this->fs] = this->parent; FontCache::caches[this->fs] = this->parent;
Layouter::ResetFontCache(this->fs); Layouter::ResetFontCache(this->fs);
} }
@ -474,7 +474,7 @@ static bool GetFontAAState(FontSize size)
const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key) const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key)
{ {
if ((key & SPRITE_GLYPH) != 0) return parent->GetGlyph(key); if ((key & SPRITE_GLYPH) != 0) return this->parent->GetGlyph(key);
/* Check for the glyph in our cache */ /* Check for the glyph in our cache */
GlyphEntry *glyph = this->GetGlyphPtr(key); GlyphEntry *glyph = this->GetGlyphPtr(key);