diff options
| author | Max Horn | 2003-09-14 18:16:45 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-14 18:16:45 +0000 |
| commit | 6512592d0f0be9afcc0f3aa30b1b505490ebea54 (patch) | |
| tree | 59eb579d38946c02e2d579de1c6d106ecacf4114 /scumm/string.cpp | |
| parent | fd7727e9d2a5414e021439eb88d30ca687ac691e (diff) | |
| download | scummvm-rg350-6512592d0f0be9afcc0f3aa30b1b505490ebea54.tar.gz scummvm-rg350-6512592d0f0be9afcc0f3aa30b1b505490ebea54.tar.bz2 scummvm-rg350-6512592d0f0be9afcc0f3aa30b1b505490ebea54.zip | |
moved Actor x/y to _pos.x/_pos.y -> this makes it much easier to grep for access of the actor position
svn-id: r10253
Diffstat (limited to 'scumm/string.cpp')
| -rw-r--r-- | scumm/string.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index 74a57f7198..903c9dd4e2 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -108,24 +108,24 @@ void Scumm::CHARSET_1() { if (a && _string[0].overhead != 0) { if (_version <= 5) { - _string[0].xpos = a->x - camera._cur.x + (_screenWidth / 2); + _string[0].xpos = a->_pos.x - camera._cur.x + (_screenWidth / 2); if (VAR(VAR_V5_TALK_STRING_Y) < 0) { s = (a->scaley * (int)VAR(VAR_V5_TALK_STRING_Y)) / 0xFF; - _string[0].ypos = (int)(((VAR(VAR_V5_TALK_STRING_Y) - s) >> 1) + s - a->elevation + a->y); + _string[0].ypos = (int)(((VAR(VAR_V5_TALK_STRING_Y) - s) >> 1) + s - a->elevation + a->_pos.y); } else { _string[0].ypos = (int)VAR(VAR_V5_TALK_STRING_Y); } } else { s = a->scaley * a->talkPosY / 0xFF; - _string[0].ypos = ((a->talkPosY - s) >> 1) + s - a->elevation + a->y; + _string[0].ypos = ((a->talkPosY - s) >> 1) + s - a->elevation + a->_pos.y; if (_string[0].ypos < _screenTop) _string[0].ypos = _screenTop; s = a->scalex * a->talkPosX / 0xFF; - _string[0].xpos = ((a->talkPosX - s) >> 1) + s + a->x - camera._cur.x + (_screenWidth / 2); + _string[0].xpos = ((a->talkPosX - s) >> 1) + s + a->_pos.x - camera._cur.x + (_screenWidth / 2); } if (_string[0].ypos < 1) |