diff options
author | Max Horn | 2007-09-08 11:15:27 +0000 |
---|---|---|
committer | Max Horn | 2007-09-08 11:15:27 +0000 |
commit | 0cccbb29d63a03582b7c3cd89265296a46530414 (patch) | |
tree | de32fb80d0d81baa413318201cb56d7281690c9b /engines/scumm/string.cpp | |
parent | 89bbbe53ac9adc19bc33e7895ca1eb32f75607fe (diff) | |
download | scummvm-rg350-0cccbb29d63a03582b7c3cd89265296a46530414.tar.gz scummvm-rg350-0cccbb29d63a03582b7c3cd89265296a46530414.tar.bz2 scummvm-rg350-0cccbb29d63a03582b7c3cd89265296a46530414.zip |
Some cleanup (yay for whomever had the brilliant idea to let SVN work over HTTPS and hence through proxies&firewalls :)
svn-id: r28877
Diffstat (limited to 'engines/scumm/string.cpp')
-rw-r--r-- | engines/scumm/string.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index 32fdf0e04e..62a29b3013 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -456,7 +456,7 @@ void ScummEngine::CHARSET_1() { if (a && _string[0].overhead) { int s; - _string[0].xpos = a->getPos().x - virtscr[0].xstart; + _string[0].xpos = a->getPos().x - _virtscr[kMainVirtScreen].xstart; _string[0].ypos = a->getPos().y - a->getElevation() - _screenTop; if (_game.version <= 5) { @@ -678,7 +678,7 @@ void ScummEngine_v8::CHARSET_1() { if (a && _string[0].overhead) { int s; - _string[0].xpos = a->getPos().x - virtscr[0].xstart; + _string[0].xpos = a->getPos().x - _virtscr[kMainVirtScreen].xstart; s = a->_scalex * a->_talkPosX / 255; _string[0].xpos += (a->_talkPosX - s) / 2 + s; |