From 7cd467dfab498a229da3f83d95111910f33a0cdd Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 8 May 2014 03:47:15 +0300
Subject: MADS: Bugfix for combining the poison darts with the plant stalk

---
 engines/mads/nebular/game_nebular.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

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)
-- 
cgit v1.2.3