diff options
| author | Paul Gilbert | 2015-03-13 22:05:21 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-03-13 22:05:21 -0400 |
| commit | 5c834815436014efd1f2b88455d8e44cf28ebc85 (patch) | |
| tree | fb3ca11ac951f45dcd0514fb3a168316cb07bcaf /engines | |
| parent | c0df1248b5a73f4b0f02d0712907878aa265dff4 (diff) | |
| download | scummvm-rg350-5c834815436014efd1f2b88455d8e44cf28ebc85.tar.gz scummvm-rg350-5c834815436014efd1f2b88455d8e44cf28ebc85.tar.bz2 scummvm-rg350-5c834815436014efd1f2b88455d8e44cf28ebc85.zip | |
MADS: Action fixes for top of south elevator scene
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/mads/nebular/nebular_scenes.h | 1 | ||||
| -rw-r--r-- | engines/mads/nebular/nebular_scenes7.cpp | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h index cf33b21aad..8549643ff8 100644 --- a/engines/mads/nebular/nebular_scenes.h +++ b/engines/mads/nebular/nebular_scenes.h @@ -924,7 +924,6 @@ enum Noun { NOUN_WHISKEY = 0x30F, NOUN_ALCOHOL = 0x310, NOUN_RIM = 0x311, - //NOUN_WALK_ALONG = 0x312, NOUN_SUBMERGED_CITY = 0x313, NOUN_GOVERNORS_HOUSE = 0x314, NOUN_RIM_TOWARDS_EAST = 0x315, diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp index 7be66670d5..b40a8054f7 100644 --- a/engines/mads/nebular/nebular_scenes7.cpp +++ b/engines/mads/nebular/nebular_scenes7.cpp @@ -279,10 +279,8 @@ void Scene701::preActions() { } void Scene701::actions() { - if (_action.isAction(VERB_WALK_ALONG, NOUN_PLATFORM)) - return; - - if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_BUILDING) && _game._objects[OBJ_VASE]._roomNumber == 706) { + if (_action.isAction(VERB_WALK_ALONG, NOUN_PLATFORM)) { + } else if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_BUILDING) && _game._objects[OBJ_VASE]._roomNumber == 706) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -418,7 +416,7 @@ void Scene701::actions() { _vm->_dialogs->show(70111); } else if (_action.isAction(VERB_LOOK, NOUN_SUBMERGED_CITY)) _vm->_dialogs->show(70112); - else if (_action.isAction(VERB_LOOK, 0)) + else if (_action.isAction(VERB_LOOK, NOUN_ELEVATOR)) _vm->_dialogs->show(70113); else if (_action.isAction(VERB_LOOK, NOUN_PLATFORM)) _vm->_dialogs->show(70114); |