Actor order needs to be checked too (For HE games)

svn-id: r17327

1 files changed, 7 insertions, 5 deletions

diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index dec39e9e57..fcb1294fac 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1215,18 +1215,20 @@ void ScummEngine::resetActorBgs() {
 }
 
 int ScummEngine::getActorFromPos(int x, int y) {
-	int i;
+	int i, result;
+	result = 0;
 
 	if (!testGfxAnyUsageBits(x / 8))
 		return 0;
 	for (i = 1; i < _numActors; i++) {
 		if (testGfxUsageBit(x / 8, i) && !getClass(i, kObjectClassUntouchable)
-			&& y >= _actors[i]._top && y <= _actors[i]._bottom) {
-			if (_version > 2 || i != VAR(VAR_EGO))
-				return i;
+			&& y >= _actors[i]._top && y <= _actors[i]._bottom && _actors[i]._pos.y > _actors[result]._pos.y) {
+			if (_version > 2 || i != VAR(VAR_EGO)) {
+				result = i;
+			}
 		}
 	}
-	return 0;
+	return result;
 }
 
 void ScummEngine::actorTalk(const byte *msg) {