diff options
| author | Einar Johan Trøan Sømåen | 2013-04-19 18:15:25 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-04-19 18:15:25 +0200 |
| commit | 9184bb5c243604709a44188794f89979e761c605 (patch) | |
| tree | 702b86d303ae22b73cd9428c03521aedcd9cf128 /engines/wintermute | |
| parent | a2fb3dfe9e6de6241962a41b9d98e38e84441b44 (diff) | |
| download | scummvm-rg350-9184bb5c243604709a44188794f89979e761c605.tar.gz scummvm-rg350-9184bb5c243604709a44188794f89979e761c605.tar.bz2 scummvm-rg350-9184bb5c243604709a44188794f89979e761c605.zip | |
WINTERMUTE: Add overrides to Font-classes.
Diffstat (limited to 'engines/wintermute')
| -rw-r--r-- | engines/wintermute/base/font/base_font_bitmap.h | 8 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font_truetype.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/wintermute/base/font/base_font_bitmap.h b/engines/wintermute/base/font/base_font_bitmap.h index 73cafb5d75..0bdac64026 100644 --- a/engines/wintermute/base/font/base_font_bitmap.h +++ b/engines/wintermute/base/font/base_font_bitmap.h @@ -39,10 +39,10 @@ public: DECLARE_PERSISTENT(BaseFontBitmap, BaseFont) bool loadBuffer(byte *Buffer); bool loadFile(const Common::String &filename); - virtual int getTextWidth(const byte *text, int maxLength = -1); - virtual int getTextHeight(const byte *text, int width); - virtual void drawText(const byte *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int maxLength = -1); - virtual int getLetterHeight(); + virtual int getTextWidth(const byte *text, int maxLength = -1) override; + virtual int getTextHeight(const byte *text, int width) override; + virtual void drawText(const byte *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int maxLength = -1) override; + virtual int getLetterHeight() override; BaseFontBitmap(BaseGame *inGame); virtual ~BaseFontBitmap(); diff --git a/engines/wintermute/base/font/base_font_truetype.h b/engines/wintermute/base/font/base_font_truetype.h index e532a5b317..f93505921f 100644 --- a/engines/wintermute/base/font/base_font_truetype.h +++ b/engines/wintermute/base/font/base_font_truetype.h @@ -100,10 +100,10 @@ public: BaseFontTT(BaseGame *inGame); virtual ~BaseFontTT(void); - virtual int getTextWidth(const byte *text, int maxLength = -1); - virtual int getTextHeight(const byte *text, int width); - virtual void drawText(const byte *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int maxLength = -1); - virtual int getLetterHeight(); + virtual int getTextWidth(const byte *text, int maxLength = -1) override; + virtual int getTextHeight(const byte *text, int width) override; + virtual void drawText(const byte *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int maxLength = -1) override; + virtual int getLetterHeight() override; bool loadBuffer(byte *buffer); bool loadFile(const Common::String &filename); |