diff options
| author | D G Turner | 2012-10-12 17:03:32 +0100 |
|---|---|---|
| committer | D G Turner | 2012-10-12 17:03:32 +0100 |
| commit | 151b7beb47ec4b964862d6779bd48e3a33482bbd (patch) | |
| tree | 867717c5266d0908d95edd82560599be20a4ede9 /engines/scumm/object.cpp | |
| parent | 80af0e239473f85c49cc2da3c848dfcde41d4a37 (diff) | |
| parent | 2b55837650c4229dc3d75b660cecfc7a3292e5e0 (diff) | |
| download | scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.tar.gz scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.tar.bz2 scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.zip | |
Merge branch 'master' into teenagentRefactor
Conflicts:
engines/teenagent/callbacks.cpp
Diffstat (limited to 'engines/scumm/object.cpp')
| -rw-r--r-- | engines/scumm/object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index 399cd91324..77c75c4ad6 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -335,7 +335,7 @@ int ScummEngine::whereIsObject(int object) const { return WIO_NOT_FOUND; if ((_game.version != 0 || OBJECT_V0_TYPE(object) == 0) && - _objectOwnerTable[object] != OF_OWNER_ROOM) + _objectOwnerTable[object] != OF_OWNER_ROOM) { for (i = 0; i < _numInventory; i++) if (_inventory[i] == object) @@ -1225,7 +1225,7 @@ byte *ScummEngine::getOBCDFromObject(int obj, bool v0CheckInventory) { byte *ptr; if ((_game.version != 0 || OBJECT_V0_TYPE(obj) == 0) && - _objectOwnerTable[obj] != OF_OWNER_ROOM) + _objectOwnerTable[obj] != OF_OWNER_ROOM) { if (_game.version == 0 && !v0CheckInventory) return 0; |