aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-07-12 22:41:58 +0000
committerMax Horn2003-07-12 22:41:58 +0000
commit66000eccbf7521122111d36d666a0e40ebbe54e7 (patch)
tree59df4f07ef4e9b644372dcbe1b8e9bf54df80bf4
parentadf9331624ba5118af0351cd8892498b1b3ef11f (diff)
downloadscummvm-rg350-66000eccbf7521122111d36d666a0e40ebbe54e7.tar.gz
scummvm-rg350-66000eccbf7521122111d36d666a0e40ebbe54e7.tar.bz2
scummvm-rg350-66000eccbf7521122111d36d666a0e40ebbe54e7.zip
fix for bug #770308
svn-id: r8958
-rw-r--r--scumm/actor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index a8c56b6dfd..8dfca3c00f 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1064,7 +1064,8 @@ int Scumm::getActorFromPos(int x, int y) {
for (i = 1; i < _numActors; i++) {
if (testGfxUsageBit(x >> 3, i) && !getClass(i, kObjectClassUntouchable)
&& y >= _actors[i].top && y <= _actors[i].bottom) {
- return i;
+ if (_version > 2 || i != VAR(VAR_EGO))
+ return i;
}
}
return 0;