1 | Index: scumm/string.cpp
|
---|
2 | ===================================================================
|
---|
3 | RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
|
---|
4 | retrieving revision 1.241
|
---|
5 | diff -u -r1.241 string.cpp
|
---|
6 | --- scumm/string.cpp 15 Aug 2004 04:52:18 -0000 1.241
|
---|
7 | +++ scumm/string.cpp 17 Aug 2004 14:30:17 -0000
|
---|
8 | @@ -95,7 +95,7 @@
|
---|
9 | if (getTalkingActor() != 0xFF)
|
---|
10 | a = derefActorSafe(getTalkingActor(), "CHARSET_1");
|
---|
11 |
|
---|
12 | - if (a && a->isInCurrentRoom() && _string[0].overhead != 0) {
|
---|
13 | + if (a && _string[0].overhead != 0) {
|
---|
14 | if (_version <= 5) {
|
---|
15 | _string[0].xpos = a->_pos.x - camera._cur.x + (_screenWidth / 2);
|
---|
16 |
|
---|
17 | @@ -108,14 +108,14 @@
|
---|
18 |
|
---|
19 | } else {
|
---|
20 | s = a->scaley * a->talkPosY / 0xFF;
|
---|
21 | - _string[0].ypos = ((a->talkPosY - s) / 2) + s - a->getElevation() + a->_pos.y;
|
---|
22 | -
|
---|
23 | - if (_string[0].ypos < _screenTop) {
|
---|
24 | - _string[0].ypos = _screenTop;
|
---|
25 | - }
|
---|
26 | + _string[0].ypos = ((a->talkPosY - s) / 2) + s - a->getElevation() + a->_pos.y - camera._cur.y + (_screenHeight / 2);
|
---|
27 |
|
---|
28 | s = a->scalex * a->talkPosX / 0xFF;
|
---|
29 | _string[0].xpos = ((a->talkPosX - s) / 2) + s + a->_pos.x - camera._cur.x + (_screenWidth / 2);
|
---|
30 | +
|
---|
31 | + if (_string[0].ypos > _screenHeight - 40)
|
---|
32 | + _string[0].ypos = _screenHeight - 40;
|
---|
33 | +
|
---|
34 | }
|
---|
35 |
|
---|
36 | if (_string[0].ypos < 1)
|
---|