diff options
| author | Paul Gilbert | 2014-06-01 20:37:21 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-06-01 20:37:21 -0400 |
| commit | 0dddc2053071aec1e276a7dcd8402d5b0e0ca270 (patch) | |
| tree | 44430868f2074a678078f3b5e62f9d262293b818 /engines/mads | |
| parent | 2e587c5b4c659144142c09984018fdd19030c4ae (diff) | |
| download | scummvm-rg350-0dddc2053071aec1e276a7dcd8402d5b0e0ca270.tar.gz scummvm-rg350-0dddc2053071aec1e276a7dcd8402d5b0e0ca270.tar.bz2 scummvm-rg350-0dddc2053071aec1e276a7dcd8402d5b0e0ca270.zip | |
MADS: Use correct article for throwing items over fence
Diffstat (limited to 'engines/mads')
| -rw-r--r-- | engines/mads/action.cpp | 4 | ||||
| -rw-r--r-- | 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 ca682f00a3..42c528aaa1 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 0a45ee42ee..ca953a0ec9 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() { |