diff options
Diffstat (limited to 'engines/wintermute/base/font/base_font_bitmap.h')
-rw-r--r-- | engines/wintermute/base/font/base_font_bitmap.h | 16 |
1 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 e380a949e2..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(); @@ -50,11 +50,11 @@ public: private: bool getWidths(); BaseSprite *_sprite; - int _widthsFrame; + int32 _widthsFrame; bool _fontextFix; - int _numColumns; - int _tileHeight; - int _tileWidth; + int32 _numColumns; + int32 _tileHeight; + int32 _tileWidth; byte _widths[NUM_CHARACTERS]; BaseSubFrame *_subframe; bool _wholeCell; |