diff options
author | Paul Gilbert | 2014-04-08 23:01:46 -0400 |
---|---|---|
committer | Paul Gilbert | 2014-04-08 23:01:46 -0400 |
commit | 09adb571d35c45941246bdce5db895d9d81fd59c (patch) | |
tree | 6051a6e34a3b13e3f30fc2deb8d88dd3dbfb7253 /engines/mads/scene.cpp | |
parent | 21a0e38f34324423e0f571ccb37a800737cd78d2 (diff) | |
download | scummvm-rg350-09adb571d35c45941246bdce5db895d9d81fd59c.tar.gz scummvm-rg350-09adb571d35c45941246bdce5db895d9d81fd59c.tar.bz2 scummvm-rg350-09adb571d35c45941246bdce5db895d9d81fd59c.zip |
MADS: Cleanup of verb/preposition flags handling
Diffstat (limited to 'engines/mads/scene.cpp')
-rw-r--r-- | engines/mads/scene.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp index 76263bd0f6..02a066a0c6 100644 --- a/engines/mads/scene.cpp +++ b/engines/mads/scene.cpp @@ -50,16 +50,16 @@ Scene::Scene(MADSEngine *vm): _vm(vm), _action(_vm), _depthSurface(vm), _layer = LAYER_GUI; _lookFlag = false; - _verbList.push_back(VerbInit(VERB_LOOK, 2, 0)); - _verbList.push_back(VerbInit(VERB_TAKE, 2, 0)); - _verbList.push_back(VerbInit(VERB_PUSH, 2, 0)); - _verbList.push_back(VerbInit(VERB_OPEN, 2, 0)); - _verbList.push_back(VerbInit(VERB_PUT, 1, -1)); - _verbList.push_back(VerbInit(VERB_TALKTO, 2, 0)); - _verbList.push_back(VerbInit(VERB_GIVE, 1, 2)); - _verbList.push_back(VerbInit(VERB_PULL, 2, 0)); - _verbList.push_back(VerbInit(VERB_CLOSE, 2, 0)); - _verbList.push_back(VerbInit(VERB_THROW, 1, 2)); + _verbList.push_back(VerbInit(VERB_LOOK, VERB_THAT, PREP_NONE)); + _verbList.push_back(VerbInit(VERB_TAKE, VERB_THAT, PREP_NONE)); + _verbList.push_back(VerbInit(VERB_PUSH, VERB_THAT, PREP_NONE)); + _verbList.push_back(VerbInit(VERB_OPEN, VERB_THAT, PREP_NONE)); + _verbList.push_back(VerbInit(VERB_PUT, VERB_THIS, PREP_RELATIONAL)); + _verbList.push_back(VerbInit(VERB_TALKTO, VERB_THAT, PREP_NONE)); + _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)); } Scene::~Scene() { |