diff options
| author | Einar Johan Trøan Sømåen | 2013-02-06 12:45:46 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-02-06 13:40:35 +0100 |
| commit | 74e32bd3329b8d7b19d97ddff140fb23b901c2d6 (patch) | |
| tree | 0094aec3cdb326d528f81971d76cbf042ff8b908 /engines/wintermute/ui | |
| parent | 83152fd6088f08c238a1d175cfadef847dd7eaac (diff) | |
| download | scummvm-rg350-74e32bd3329b8d7b19d97ddff140fb23b901c2d6.tar.gz scummvm-rg350-74e32bd3329b8d7b19d97ddff140fb23b901c2d6.tar.bz2 scummvm-rg350-74e32bd3329b8d7b19d97ddff140fb23b901c2d6.zip | |
WINTERMUTE: Privatize a few more members in BaseGame.
Diffstat (limited to 'engines/wintermute/ui')
| -rw-r--r-- | engines/wintermute/ui/ui_button.cpp | 12 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_edit.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_text.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp index 2c356b2b7e..6ee577f009 100644 --- a/engines/wintermute/ui/ui_button.cpp +++ b/engines/wintermute/ui/ui_button.cpp @@ -622,15 +622,15 @@ void UIButton::correctSize() { } if (_text) { - int text_height; + int textHeight; if (_font) { - text_height = _font->getTextHeight((byte *)_text, _width); + textHeight = _font->getTextHeight((byte *)_text, _width); } else { - text_height = _gameRef->_systemFont->getTextHeight((byte *)_text, _width); + textHeight = _gameRef->getSystemFont()->getTextHeight((byte *)_text, _width); } - if (text_height > _height) { - _height = text_height; + if (textHeight > _height) { + _height = textHeight; } } @@ -717,7 +717,7 @@ bool UIButton::display(int offsetX, int offsetY) { if (_font) { font = _font; } else { - font = _gameRef->_systemFont; + font = _gameRef->getSystemFont(); } } diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp index 7728272ccd..0a2e6f13bc 100644 --- a/engines/wintermute/ui/ui_edit.cpp +++ b/engines/wintermute/ui/ui_edit.cpp @@ -589,7 +589,7 @@ bool UIEdit::display(int offsetX, int offsetY) { if (_font) { font = _font; } else { - font = _gameRef->_systemFont; + font = _gameRef->getSystemFont(); } if (_fontSelected) { diff --git a/engines/wintermute/ui/ui_text.cpp b/engines/wintermute/ui/ui_text.cpp index 5a1bffcdc0..3b5adf07b7 100644 --- a/engines/wintermute/ui/ui_text.cpp +++ b/engines/wintermute/ui/ui_text.cpp @@ -69,7 +69,7 @@ bool UIText::display(int offsetX, int offsetY) { BaseFont *font = _font; if (!font) { - font = _gameRef->_systemFont; + font = _gameRef->getSystemFont(); } if (_back) { |