diff options
| author | Filippos Karapetis | 2014-05-26 21:22:51 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2014-05-26 21:24:23 +0300 |
| commit | 2878863fa486fdbf2cc2593a8c1ce633434e375e (patch) | |
| tree | 9d9245d0fdc8853f235462a7bfee9863a827e9fb /engines/mads/nebular/nebular_scenes5.cpp | |
| parent | d951cb9bda5e4b37653feb581f26024a76885b58 (diff) | |
| download | scummvm-rg350-2878863fa486fdbf2cc2593a8c1ce633434e375e.tar.gz scummvm-rg350-2878863fa486fdbf2cc2593a8c1ce633434e375e.tar.bz2 scummvm-rg350-2878863fa486fdbf2cc2593a8c1ce633434e375e.zip | |
MADS: Add more friendly names for action verbs and nouns
Diffstat (limited to 'engines/mads/nebular/nebular_scenes5.cpp')
| -rw-r--r-- | engines/mads/nebular/nebular_scenes5.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp index a8c6b22591..822fbdf6ba 100644 --- a/engines/mads/nebular/nebular_scenes5.cpp +++ b/engines/mads/nebular/nebular_scenes5.cpp @@ -1994,10 +1994,10 @@ void Scene511::preActions() { if (!_handingLine) return; - if (_action.isAction(VERB_LOOK) || _action.isAction(0x87) || _action.isAction(VERB_TALKTO)) + if (_action.isAction(VERB_LOOK) || _action.isObject(NOUN_FISHING_LINE) || _action.isAction(VERB_TALKTO)) _game._player._needToWalk = false; - if ((!_action.isAction(0x170, 0x87, 0x345) || !_action.isAction(0x19, 0x87, 0x345)) && _game._player._needToWalk) { + if ((!_action.isAction(VERB_TIE, NOUN_FISHING_LINE, NOUN_BOAT) || !_action.isAction(VERB_ATTACH, NOUN_FISHING_LINE, NOUN_BOAT)) && _game._player._needToWalk) { if (_game._trigger == 0) { _game._player._readyToWalk = false; _game._player._stepEnabled = false; @@ -2085,7 +2085,7 @@ void Scene511::actions() { } else { _vm->_dialogs->show(51130); } - } else if (_action.isAction(0x170, 0x87, 0x345) || _action.isAction(0x19, 0x87, 0x345)) { + } else if (_action.isAction(VERB_TIE, NOUN_FISHING_LINE, NOUN_BOAT) || _action.isAction(VERB_ATTACH, NOUN_FISHING_LINE, NOUN_BOAT)) { if (_globals[kBoatRaised]) _vm->_dialogs->show(51131); else if (_globals[kLineStatus] == 1) @@ -2141,8 +2141,8 @@ void Scene511::actions() { else if (_action.isAction(VERB_UNLOCK, 0xFF, 0x37C) || _action.isAction(VERB_UNLOCK, 0x6F, 0x37C)) _vm->_dialogs->show(51119); else if ( (_action.isAction(VERB_PUT) || _action.isAction(VERB_THROW)) - && (_action.isAction(0x171) || _action.isAction(0x2A) || _action.isAction(0x2B)) - && _action.isAction(0x37C)) + && (_action.isObject(NOUN_TIMEBOMB) || _action.isObject(NOUN_BOMB) || _action.isObject(NOUN_BOMBS)) + && _action.isObject(NOUN_DOME_ENTRANCE)) _vm->_dialogs->show(51120); else if (_action.isAction(VERB_LOOK, NOUN_RESTAURANT)) { if (_globals[kBoatRaised]) |