diff options
author | Eugene Sandulenko | 2005-03-11 01:10:06 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2005-03-11 01:10:06 +0000 |
commit | 154c4af8dc2d561050a5a963e2b45403cda618dc (patch) | |
tree | 0c4b41ed77afeb42036fdba990805b180edc7c24 /scumm/string.cpp | |
parent | 3cf691e9f9d0aafad14b76272201a0cfac2e8a76 (diff) | |
download | scummvm-rg350-154c4af8dc2d561050a5a963e2b45403cda618dc.tar.gz scummvm-rg350-154c4af8dc2d561050a5a963e2b45403cda618dc.tar.bz2 scummvm-rg350-154c4af8dc2d561050a5a963e2b45403cda618dc.zip |
Mass-renamed all variables of Actor object according to our current code
formatting standards. Earlier we had half of vars named with leading
underscore and half without it.
Now code in actor.cpp is considerably more readable.
svn-id: r17068
Diffstat (limited to 'scumm/string.cpp')
-rw-r--r-- | scumm/string.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index 79fcdadd04..c1748e3669 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -126,18 +126,18 @@ void ScummEngine::CHARSET_1() { if (_version <= 5) { if (VAR(VAR_V5_TALK_STRING_Y) < 0) { - s = (a->scaley * (int)VAR(VAR_V5_TALK_STRING_Y)) / 0xFF; + s = (a->_scaley * (int)VAR(VAR_V5_TALK_STRING_Y)) / 0xFF; _string[0].ypos += (int)(((VAR(VAR_V5_TALK_STRING_Y) - s) / 2) + s); } else { _string[0].ypos = (int)VAR(VAR_V5_TALK_STRING_Y); } } else { - s = a->scalex * a->talkPosX / 0xFF; - _string[0].xpos += ((a->talkPosX - s) / 2) + s; + s = a->_scalex * a->_talkPosX / 0xFF; + _string[0].xpos += ((a->_talkPosX - s) / 2) + s; - s = a->scaley * a->talkPosY / 0xFF; - _string[0].ypos += ((a->talkPosY - s) / 2) + s; + s = a->_scaley * a->_talkPosY / 0xFF; + _string[0].ypos += ((a->_talkPosY - s) / 2) + s; if (_string[0].ypos > _screenHeight - 40) _string[0].ypos = _screenHeight - 40; @@ -158,8 +158,8 @@ void ScummEngine::CHARSET_1() { _charset->_center = _string[0].center; _charset->setColor(_charsetColor); - if (a && a->charset) - _charset->setCurID(a->charset); + if (a && a->_charset) + _charset->setCurID(a->_charset); else _charset->setCurID(_string[0].charset); |