diff options
author | Eugene Sandulenko | 2019-11-24 18:17:02 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2019-11-24 18:17:02 +0000 |
commit | 991e7d447bd919934002858dad8e8cb4f9dd1eed (patch) | |
tree | dba26f312c2fea61a18928bd59cfe9e61c79c061 /engines/director/cachedmactext.cpp | |
parent | 6a650e10b1fed68e52134f6959bda5f560eebe06 (diff) | |
download | scummvm-rg350-991e7d447bd919934002858dad8e8cb4f9dd1eed.tar.gz scummvm-rg350-991e7d447bd919934002858dad8e8cb4f9dd1eed.tar.bz2 scummvm-rg350-991e7d447bd919934002858dad8e8cb4f9dd1eed.zip |
DIRECTOR: Rename Cast class variables to follow our naming conventions
Diffstat (limited to 'engines/director/cachedmactext.cpp')
-rw-r--r-- | engines/director/cachedmactext.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/director/cachedmactext.cpp b/engines/director/cachedmactext.cpp index a479376996..d9a0740f78 100644 --- a/engines/director/cachedmactext.cpp +++ b/engines/director/cachedmactext.cpp @@ -35,10 +35,10 @@ void CachedMacText::makeMacText() { delete _macText; - if ((int)_textCast->textAlign == -1) + if ((int)_textCast->_textAlign == -1) _align = (Graphics::TextAlign)3; else - _align = (Graphics::TextAlign)((int)_textCast->textAlign + 1); + _align = (Graphics::TextAlign)((int)_textCast->_textAlign + 1); _macText = new Graphics::MacText(_textCast->_ftext, _wm, @@ -62,17 +62,17 @@ CachedMacText::CachedMacText(TextCast *const textCast, _surface(NULL), _macFont(NULL), _macText(NULL), _width(defaultWidth), _dirty(true), _textCast(textCast), _wm(wm) { - _macFont = new Graphics::MacFont(_textCast->fontId, - _textCast->fontSize, - _textCast->textSlant); + _macFont = new Graphics::MacFont(_textCast->_fontId, + _textCast->_fontSize, + _textCast->_textSlant); // TODO destroy me if (_width == -1) { if (version >= 4) { // This came from frame.cpp - _width = _textCast->initialRect.right; + _width = _textCast->_initialRect.right; } else { - _width = _textCast->initialRect.width(); + _width = _textCast->_initialRect.width(); } } |