diff options
| author | Gregory Montoir | 2006-12-21 15:09:13 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2006-12-21 15:09:13 +0000 |
| commit | cfd4ffb321112a311eb800077c4483d76a6d63d6 (patch) | |
| tree | 0cd1c91a13753317c8ede391b95a065b0b0e72de /engines/scumm/actor.cpp | |
| parent | e6f95af215f226280ff7dca27c52181e604ce09a (diff) | |
| download | scummvm-rg350-cfd4ffb321112a311eb800077c4483d76a6d63d6.tar.gz scummvm-rg350-cfd4ffb321112a311eb800077c4483d76a6d63d6.tar.bz2 scummvm-rg350-cfd4ffb321112a311eb800077c4483d76a6d63d6.zip | |
fixed bug #1620023 (script calls putActorAtXY with y == -1)
svn-id: r24910
Diffstat (limited to 'engines/scumm/actor.cpp')
| -rw-r--r-- | engines/scumm/actor.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index 2f38b421c4..1e2a3b504d 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -878,13 +878,6 @@ void ScummEngine::putActors() { } void Actor::putActor(int dstX, int dstY, int newRoom) { - if (dstX == -1) - dstX = _pos.x; - if (dstY == -1) - dstY = _pos.y; - if (newRoom == -1) - newRoom = _room; - if (_visible && _vm->_currentRoom != newRoom && _vm->getTalkingActor() == _number) { _vm->stopTalk(); } @@ -1712,7 +1705,7 @@ void ScummEngine::setTalkingActor(int value) { // Work out the screen co-ordinates of the actor int x = _actors[value].getPos().x - (camera._cur.x - (_screenWidth >> 1)); int y = _actors[value]._top - (camera._cur.y - (_screenHeight >> 1)); - + // Set the focus area to the calculated position // TODO: Make the size adjust depending on what it's focusing on. Common::Rect rect(x - 96, y - 64, x + 96, y + 64); |