| 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 06:34:12 -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 | @@ -110,9 +110,11 @@
|
|---|
| 18 | s = a->scaley * a->talkPosY / 0xFF;
|
|---|
| 19 | _string[0].ypos = ((a->talkPosY - s) / 2) + s - a->getElevation() + a->_pos.y;
|
|---|
| 20 |
|
|---|
| 21 | +/*
|
|---|
| 22 | if (_string[0].ypos < _screenTop) {
|
|---|
| 23 | _string[0].ypos = _screenTop;
|
|---|
| 24 | }
|
|---|
| 25 | +*/
|
|---|
| 26 |
|
|---|
| 27 | s = a->scalex * a->talkPosX / 0xFF;
|
|---|
| 28 | _string[0].xpos = ((a->talkPosX - s) / 2) + s + a->_pos.x - camera._cur.x + (_screenWidth / 2);
|
|---|
