From cfd4ffb321112a311eb800077c4483d76a6d63d6 Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Thu, 21 Dec 2006 15:09:13 +0000
Subject: fixed bug #1620023 (script calls putActorAtXY with y == -1)

svn-id: r24910
---
 engines/scumm/actor.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'engines/scumm/actor.cpp')

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);
-- 
cgit v1.2.3