aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2014-05-08 03:47:15 +0300
committerFilippos Karapetis2014-05-08 03:47:15 +0300
commit7cd467dfab498a229da3f83d95111910f33a0cdd (patch)
tree9982b787bb3cdd213f00aee5a749f29b6d92e1e6
parent99ea49fe6189f3e7d66e28be64eaab23dac9aeb4 (diff)
downloadscummvm-rg350-7cd467dfab498a229da3f83d95111910f33a0cdd.tar.gz
scummvm-rg350-7cd467dfab498a229da3f83d95111910f33a0cdd.tar.bz2
scummvm-rg350-7cd467dfab498a229da3f83d95111910f33a0cdd.zip
MADS: Bugfix for combining the poison darts with the plant stalk
-rw-r--r--engines/mads/nebular/game_nebular.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 9d6bf894cc..b1dcfb09ce 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -358,10 +358,10 @@ void GameNebular::doObjectAction() {
dialogs.show(476);
} else if (action.isAction(114, 937)) {
dialogs.show(477);
- } else if (action.isAction(VERB_PUT, 276, NOUN_PLANT_STALK) && _objects.isInRoom(OBJ_POISON_DARTS)
- && _objects.isInRoom(OBJ_PLANT_STALK)) {
+ } else if (action.isAction(VERB_PUT, 276, NOUN_PLANT_STALK) && _objects.isInInventory(OBJ_POISON_DARTS)
+ && _objects.isInInventory(OBJ_PLANT_STALK)) {
_objects.addToInventory(OBJ_BLOWGUN);
- _objects.setRoom(OBJ_PLANT_STALK, PLAYER_INVENTORY);
+ _objects.setRoom(OBJ_PLANT_STALK, NOWHERE);
_globals[kBlowgunStatus] = 0;
dialogs.showItem(OBJ_BLOWGUN, 809);
} else if (action.isAction(VERB_PUT, 276, NOUN_BLOWGUN) && _objects.isInInventory(OBJ_POISON_DARTS)