diff options
Diffstat (limited to 'engines/wintermute/base/font/base_font_truetype.h')
| -rw-r--r-- | engines/wintermute/base/font/base_font_truetype.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/engines/wintermute/base/font/base_font_truetype.h b/engines/wintermute/base/font/base_font_truetype.h index f93505921f..edb41a155f 100644 --- a/engines/wintermute/base/font/base_font_truetype.h +++ b/engines/wintermute/base/font/base_font_truetype.h @@ -56,9 +56,8 @@ private: bool _marked; uint32 _lastUsed; - BaseCachedTTFontText() { + BaseCachedTTFontText() : _text() { //_text = L""; - _text = ""; _width = _maxHeight = _maxLength = -1; _align = TAL_LEFT; _surface = nullptr; @@ -84,9 +83,9 @@ public: } bool persist(BasePersistenceManager *persistMgr) { - persistMgr->transfer(TMEMBER(_offsetX)); - persistMgr->transfer(TMEMBER(_offsetY)); - persistMgr->transfer(TMEMBER(_color)); + persistMgr->transferSint32(TMEMBER(_offsetX)); + persistMgr->transferSint32(TMEMBER(_offsetY)); + persistMgr->transferUint32(TMEMBER(_color)); return STATUS_OK; } @@ -105,7 +104,7 @@ public: 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 loadBuffer(char *buffer); bool loadFile(const Common::String &filename); float getLineHeight() const { @@ -116,7 +115,7 @@ public: void initLoop(); private: - bool parseLayer(BaseTTFontLayer *layer, byte *buffer); + bool parseLayer(BaseTTFontLayer *layer, char *buffer); void measureText(const WideString &text, int maxWidth, int maxHeight, int &textWidth, int &textHeight); @@ -135,7 +134,7 @@ private: size_t _maxCharWidth; size_t _maxCharHeight; -public: +private: bool _isBold; bool _isItalic; bool _isUnderline; @@ -148,6 +147,6 @@ public: }; -} // end of namespace Wintermute +} // End of namespace Wintermute #endif |