fixing scene transition

svn-id: r16480

1 files changed, 7 insertions, 3 deletions

diff --git a/saga/actor.cpp b/saga/actor.cpp
index e7611ebd8a..3e491ca0d0 100644
--- a/saga/actor.cpp
+++ b/saga/actor.cpp
@@ -370,11 +370,11 @@ ActorData *Actor::getActor(uint16 actorId) {
 }
 
 bool Actor::validFollowerLocation(const ActorLocation &location) {
-	Point point;
+	Point point;	
 	location.toScreenPointXY(point);
 	
 	if ((point.x < 5) || (point.x >= _vm->getDisplayWidth() - 5) ||
-		(point.y < 0) || (point.y >= _vm->getStatusYOffset())) {
+		(point.y < 0) || (point.y > _vm->getStatusYOffset())) {
 		return false;
 	}
 	
@@ -1379,7 +1379,11 @@ void Actor::findActorPath(ActorData *actor, const Point &fromPoint, const Point
 
 	for (iteratorPoint.y = 0; iteratorPoint.y < _yCellCount; iteratorPoint.y++) {
 		for (iteratorPoint.x = 0; iteratorPoint.x < _xCellCount; iteratorPoint.x++) {
-			maskType = _vm->_scene->getBGMaskType(iteratorPoint);
+			if (_vm->_scene->validBGMaskPoint(iteratorPoint)) {
+				maskType = _vm->_scene->getBGMaskType(iteratorPoint);
+			} else {
+				maskType = 1;
+			}			
 			setPathCell(iteratorPoint,  maskType ? kPathCellBarrier : kPathCellEmpty);			
 		}
 	}