From 0dddc2053071aec1e276a7dcd8402d5b0e0ca270 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 1 Jun 2014 20:37:21 -0400 Subject: [PATCH] MADS: Use correct article for throwing items over fence --- engines/mads/action.cpp | 4 ++-- engines/mads/scene.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp index ca682f00a358..42c528aaa17d 100644 --- a/engines/mads/action.cpp +++ b/engines/mads/action.cpp @@ -246,8 +246,8 @@ void MADSAction::set() { _statusText += kArticleList[articleNum]; } - } else if ((_articleNumber == VERB_LOOK) || (_vm->getGameID() != GType_RexNebular) || - (_action._indirectObjectId >= 0 && scene._vocabStrings[_action._indirectObjectId] != kFenceStr)) { + } else if ((_articleNumber != VERB_LOOK) || (_vm->getGameID() != GType_RexNebular) || + (_action._indirectObjectId >= 0 && scene.getVocab(_action._indirectObjectId) != kFenceStr)) { // Write out the article _statusText += kArticleList[_articleNumber]; } else { diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp index 0a45ee42ee1f..ca953a0ec9c2 100644 --- a/engines/mads/scene.cpp +++ b/engines/mads/scene.cpp @@ -76,7 +76,7 @@ Scene::Scene(MADSEngine *vm) _verbList.push_back(VerbInit(VERB_GIVE, VERB_THIS, PREP_TO)); _verbList.push_back(VerbInit(VERB_PULL, VERB_THAT, PREP_NONE)); _verbList.push_back(VerbInit(VERB_CLOSE, VERB_THAT, PREP_NONE)); - _verbList.push_back(VerbInit(VERB_THROW, VERB_THIS, PREP_TO)); + _verbList.push_back(VerbInit(VERB_THROW, VERB_THIS, PREP_AT)); } Scene::~Scene() {