aboutsummaryrefslogtreecommitdiff
path: root/scumm/object.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-19 01:27:30 +0000
committerMax Horn2003-05-19 01:27:30 +0000
commita2ce5b6383882c2cd61aec241630dfce591c4945 (patch)
tree879d771aa055051c0d04e52f284ce96a5cacc05c /scumm/object.cpp
parent40ce9cdcc34492dc9972fd6c3c111756f8c9fba8 (diff)
downloadscummvm-rg350-a2ce5b6383882c2cd61aec241630dfce591c4945.tar.gz
scummvm-rg350-a2ce5b6383882c2cd61aec241630dfce591c4945.tar.bz2
scummvm-rg350-a2ce5b6383882c2cd61aec241630dfce591c4945.zip
don't touch untouchable objects in V2 games
svn-id: r7664
Diffstat (limited to 'scumm/object.cpp')
-rw-r--r--scumm/object.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index b523b1b7ee..d516e5b026 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -255,6 +255,8 @@ int Scumm::findObject(int x, int y) {
for (i = 1; i < _numLocalObjects; i++) {
if ((_objs[i].obj_nr < 1) || getClass(_objs[i].obj_nr, 32))
continue;
+ if (_features & GF_AFTER_V2 && _objs[i].state & 0x2)
+ continue;
b = i;
do {
a = _objs[b].parentstate;