diff options
author | Eugene Sandulenko | 2017-01-30 22:58:02 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2017-01-30 22:58:32 +0100 |
commit | 119e1bd30d7c5f95fa5113c4700384bc5c217882 (patch) | |
tree | 0fb54541517693f38cf4327565622e923165e98a /graphics/macgui/mactext.h | |
parent | 93e35cb9d720b2890286ec07d50bc5e4b090a8c9 (diff) | |
download | scummvm-rg350-119e1bd30d7c5f95fa5113c4700384bc5c217882.tar.gz scummvm-rg350-119e1bd30d7c5f95fa5113c4700384bc5c217882.tar.bz2 scummvm-rg350-119e1bd30d7c5f95fa5113c4700384bc5c217882.zip |
GRAPHICS: More work on rich text formatting
Diffstat (limited to 'graphics/macgui/mactext.h')
-rw-r--r-- | graphics/macgui/mactext.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/graphics/macgui/mactext.h b/graphics/macgui/mactext.h index 241ad65314..17c3b394bd 100644 --- a/graphics/macgui/mactext.h +++ b/graphics/macgui/mactext.h @@ -45,26 +45,18 @@ struct MacFontRun { MacFontRun() { wm = nullptr; - fontId = textSlant = unk3f = fontSize; - palinfo1 = palinfo2 = palinfo3; + fontId = textSlant = unk3f = fontSize = 0; + palinfo1 = palinfo2 = palinfo3 = 0; font = nullptr; } MacFontRun(MacWindowManager *wm_, uint16 fontId_, byte textSlant_, byte unk3f_, uint16 fontSize_, uint16 palinfo1_, uint16 palinfo2_, uint16 palinfo3_) { - wm = wm_; - fontId = fontId_; - textSlant = textSlant_; - unk3f = unk3f_; - fontSize = fontSize_; - palinfo1 = palinfo1_; - palinfo2 = palinfo2_; - palinfo3 = palinfo3_; - font = nullptr; + setValues(wm_, fontId_, textSlant_, unk3f_, fontSize_, palinfo1_, palinfo2_, palinfo3_); } void setValues(MacWindowManager *wm_, uint16 fontId_, byte textSlant_, byte unk3f_, uint16 fontSize_, - uint16 palinfo1_, uint16 palinfo2_, uint16 palinfo3_, const Font *font_) { + uint16 palinfo1_, uint16 palinfo2_, uint16 palinfo3_) { wm = wm_; fontId = fontId_; textSlant = textSlant_; @@ -73,7 +65,7 @@ struct MacFontRun { palinfo1 = palinfo1_; palinfo2 = palinfo2_; palinfo3 = palinfo3_; - font = font_; + font = nullptr; } const Font *getFont(); @@ -120,6 +112,7 @@ private: Common::Array< Common::Array<MacFontRun> > _formatting; MacFontRun _defaultFormatting; + MacFontRun _currentFormatting; }; } // End of namespace Graphics |