diff options
author | Filippos Karapetis | 2014-05-04 15:59:00 +0300 |
---|---|---|
committer | Filippos Karapetis | 2014-05-04 15:59:00 +0300 |
commit | 9966afbb8f215b1ba8dfaf752355060b1d7b1092 (patch) | |
tree | bfa5d179633f0db974295c9ea74fafd29fe8f30c /engines/mads | |
parent | 2e5fcc1460bca88338c70142ba31246f6dc15421 (diff) | |
download | scummvm-rg350-9966afbb8f215b1ba8dfaf752355060b1d7b1092.tar.gz scummvm-rg350-9966afbb8f215b1ba8dfaf752355060b1d7b1092.tar.bz2 scummvm-rg350-9966afbb8f215b1ba8dfaf752355060b1d7b1092.zip |
MADS: More naming for scene 208
Diffstat (limited to 'engines/mads')
-rw-r--r-- | engines/mads/nebular/nebular_scenes.h | 3 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes2.cpp | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h index 0c39899e46..85b24050d6 100644 --- a/engines/mads/nebular/nebular_scenes.h +++ b/engines/mads/nebular/nebular_scenes.h @@ -39,6 +39,7 @@ enum { }; enum Noun { + NOUN_BIG_LEAVES = 0x23, NOUN_BLOWGUN = 0x29, NOUN_BOMB = 0x2A, NOUN_BOMBS = 0x2B, @@ -87,8 +88,10 @@ enum Noun { NOUN_STUFFED_FISH = 0x157, NOUN_15F = 0x15F, NOUN_TIMEBOMB = 0x171, + NOUN_TWINKIFRUIT = 0x17A, NOUN_VIEW_SCREEN = 0x180, NOUN_WALK_THROUGH = 0x18B, + NOUN_DEEP_PIT = 0x19E, NOUN_HUGE_LEGS = 0x1A8, NOUN_LEAF_COVERED_PIT = 0x1A9, NOUN_PILE_OF_LEAVES = 0x1AA, diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp index 5f64ebc07f..44fac5a4df 100644 --- a/engines/mads/nebular/nebular_scenes2.cpp +++ b/engines/mads/nebular/nebular_scenes2.cpp @@ -1635,21 +1635,21 @@ void Scene208::actions() { subAction(1); if (_game._player._stepEnabled) _vm->_dialogs->showItem(OBJ_BIG_LEAVES, 0x326, 0); - } else if (_action.isAction(VERB_PUT, 0x23, 0x19E) && (_globals[kLeavesStatus] == 1 || _game._trigger)) { + } else if (_action.isAction(VERB_PUT, NOUN_BIG_LEAVES, NOUN_DEEP_PIT) && (_globals[kLeavesStatus] == 1 || _game._trigger)) { subAction(2); - } else if (_action.isAction(VERB_PUT, OBJ_TWINKIFRUIT, NOUN_LEAF_COVERED_PIT)) { + } else if (_action.isAction(VERB_PUT, NOUN_TWINKIFRUIT, NOUN_LEAF_COVERED_PIT)) { subAction(3); if (_game._player._stepEnabled) { _game._player._stepEnabled = false; _rhotundaTurnFl = true; _game._player.walk(Common::Point(20, 148), FACING_EAST); } - } else if (_action.isAction(VERB_PUT, 0x35, NOUN_LEAF_COVERED_PIT)) { + } else if (_action.isAction(VERB_PUT, NOUN_BURGER, NOUN_LEAF_COVERED_PIT)) { subAction(4); if (_game._player._stepEnabled) { _vm->_dialogs->show(0x514C); } - } else if (_action.isAction(VERB_PUT, 0x65, NOUN_LEAF_COVERED_PIT)) { + } else if (_action.isAction(VERB_PUT, NOUN_DEAD_FISH, NOUN_LEAF_COVERED_PIT)) { subAction(5); if (_game._player._stepEnabled) { _vm->_dialogs->show(0x514C); @@ -1668,7 +1668,7 @@ void Scene208::actions() { _vm->_dialogs->show(0x5146); } else if (_action.isAction(VERB_LOOK, 0x9B)) { _vm->_dialogs->show(0x5147); - } else if (_action.isAction(VERB_LOOK, 0x19E)) { + } else if (_action.isAction(VERB_LOOK, NOUN_DEEP_PIT)) { _vm->_dialogs->show(0x5148); } else if (_action.isAction(VERB_LOOK, NOUN_PILE_OF_LEAVES)) { _vm->_dialogs->show(0x5149); @@ -1683,7 +1683,7 @@ void Scene208::actions() { _vm->_dialogs->show(0x514E); } else if (_action.isAction(VERB_LOOK, NOUN_HUGE_LEGS)) { _vm->_dialogs->show(0x514F); - } else if (_action.isAction(VERB_TAKE, NOUN_HUGE_LEGS) || _action.isAction(0xA, NOUN_HUGE_LEGS)) { + } else if (_action.isAction(VERB_TAKE, NOUN_HUGE_LEGS) || _action.isAction(VERB_PULL, NOUN_HUGE_LEGS)) { _vm->_dialogs->show(0x5150); } else if (_action._savedFields._lookFlag == 0) { return; |