diff options
| author | Max Horn | 2011-05-21 19:47:57 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-23 12:13:02 +0200 |
| commit | 90d3fc9f5be7bdfc789c9739db017e9e464e3943 (patch) | |
| tree | 672af9e37309d65589377766ae159b946556d080 /graphics/font.h | |
| parent | e7c642b010c47d2520d21ea5b3c041d861bc1532 (diff) | |
| download | scummvm-rg350-90d3fc9f5be7bdfc789c9739db017e9e464e3943.tar.gz scummvm-rg350-90d3fc9f5be7bdfc789c9739db017e9e464e3943.tar.bz2 scummvm-rg350-90d3fc9f5be7bdfc789c9739db017e9e464e3943.zip | |
GRAPHICS: Rename some members of NewFont
Diffstat (limited to 'graphics/font.h')
| -rw-r--r-- | graphics/font.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/graphics/font.h b/graphics/font.h index f68f49175f..7a992674d2 100644 --- a/graphics/font.h +++ b/graphics/font.h @@ -157,15 +157,15 @@ struct NewFontData; class NewFont : public Font { protected: - FontDesc desc; - NewFontData *font; + FontDesc _desc; + NewFontData *_font; public: - NewFont(const FontDesc &d, NewFontData *font_ = 0) : desc(d), font(font_) {} + NewFont(const FontDesc &desc, NewFontData *font = 0) : _desc(desc), _font(font) {} ~NewFont(); - virtual int getFontHeight() const { return desc.height; } - virtual int getMaxCharWidth() const { return desc.maxwidth; } + virtual int getFontHeight() const { return _desc.height; } + virtual int getMaxCharWidth() const { return _desc.maxwidth; } virtual int getCharWidth(byte chr) const; virtual void drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const; |