aboutsummaryrefslogtreecommitdiff
path: root/engines/mads
diff options
context:
space:
mode:
authorPaul Gilbert2014-05-27 21:55:11 -0400
committerPaul Gilbert2014-05-27 21:55:11 -0400
commit6e0762f3beb0d10e692e1e5fc6c3bd4c49510486 (patch)
tree38eec9c6da80a8a5ebc81675ece7ca372fa03eb0 /engines/mads
parent0b3a6b97c0fe3404bf7d7a356b63d552b40c486b (diff)
downloadscummvm-rg350-6e0762f3beb0d10e692e1e5fc6c3bd4c49510486.tar.gz
scummvm-rg350-6e0762f3beb0d10e692e1e5fc6c3bd4c49510486.tar.bz2
scummvm-rg350-6e0762f3beb0d10e692e1e5fc6c3bd4c49510486.zip
MADS: Stop showing picture dialogs for items before you've picked them up
Diffstat (limited to 'engines/mads')
-rw-r--r--engines/mads/nebular/game_nebular.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index db9ea2c7d1..e5a59a0050 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -425,7 +425,8 @@ void GameNebular::doObjectAction() {
} else if ((action.isAction(VERB_LOOK) || action.isAction(VERB_READ)) &&
((id = _objects.getIdFromDesc(action._activeAction._objectNameId)) > 0 ||
(action._activeAction._indirectObjectId > 0 &&
- (id = _objects.getIdFromDesc(action._activeAction._indirectObjectId))))) {
+ (id = _objects.getIdFromDesc(action._activeAction._indirectObjectId)))) &&
+ _objects.isInInventory(id)) {
if (id == OBJ_REPAIR_LIST) {
dialogs._indexList[0] = _globals[kTeleporterCode + 7];
dialogs._indexList[1] = _globals[kTeleporterCode + 8];