diff options
| author | Max Horn | 2002-12-23 14:16:43 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-23 14:16:43 +0000 |
| commit | cc5872924e8fea9e24af57a1891de230c26494cf (patch) | |
| tree | d2eadff2541852e233aaf88aa34236ab90096f37 /scumm/string.cpp | |
| parent | e192142dac67b313f8dceb97417ad547e2ad68a3 (diff) | |
| download | scummvm-rg350-cc5872924e8fea9e24af57a1891de230c26494cf.tar.gz scummvm-rg350-cc5872924e8fea9e24af57a1891de230c26494cf.tar.bz2 scummvm-rg350-cc5872924e8fea9e24af57a1891de230c26494cf.zip | |
renamed new_1, new_2, new_3 in class Actor
svn-id: r6069
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 edead0597f..8fcf6ea879 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -477,16 +477,16 @@ void Scumm::CHARSET_1() if (_string[0].xpos > _realWidth - 80) _string[0].xpos = _realWidth - 80; } else { - s = a->scaley * a->new_1 / 0xFF; - _string[0].ypos = ((a->new_1 - s) >> 1) + s - a->elevation + a->y; + s = a->scaley * a->talkPosX / 0xFF; + _string[0].ypos = ((a->talkPosX - s) >> 1) + s - a->elevation + a->y; if (_string[0].ypos < 1) _string[0].ypos = 1; if (_string[0].ypos < camera._cur.y - (_realHeight / 2)) _string[0].ypos = camera._cur.y - (_realHeight / 2); - s = a->scalex * a->new_2 / 0xFF; - _string[0].xpos = ((a->new_2 - s) >> 1) + s + a->x - camera._cur.x + (_realWidth / 2); + s = a->scalex * a->talkPosY / 0xFF; + _string[0].xpos = ((a->talkPosY - s) >> 1) + s + a->x - camera._cur.x + (_realWidth / 2); if (_string[0].xpos < 80) _string[0].xpos = 80; if (_string[0].xpos > _realWidth - 80) |