diff options
| author | Paul Gilbert | 2014-04-03 22:50:47 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-04-03 22:50:47 -0400 |
| commit | 19a814f38ccb6c3758e6dacd3d3e1747e2aa6947 (patch) | |
| tree | 489e2bcd8a3bac0c762c91c8ebeaff7cbc315c4a | |
| parent | 25b93a11ee28256331bb52ccdf5441e357c367c1 (diff) | |
| download | scummvm-rg350-19a814f38ccb6c3758e6dacd3d3e1747e2aa6947.tar.gz scummvm-rg350-19a814f38ccb6c3758e6dacd3d3e1747e2aa6947.tar.bz2 scummvm-rg350-19a814f38ccb6c3758e6dacd3d3e1747e2aa6947.zip | |
MADS: Fix setting _commandError in MADSAction::startAction
| -rw-r--r-- | engines/mads/action.cpp | 2 | ||||
| -rw-r--r-- | engines/mads/nebular/nebular_scenes1.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp index 8ee46e2a39..005058078b 100644 --- a/engines/mads/action.cpp +++ b/engines/mads/action.cpp @@ -289,7 +289,7 @@ void MADSAction::startAction() { _activeAction = _action; _sentence = _statusText; - if ((_mainObjectSource == ACTIONMODE2_4) && (_secondObjectSource == 0)) + if ((_mainObjectSource == ACTIONMODE2_4) && (_secondObjectSource == 4)) _savedFields._commandError = true; player._needToWalk = false; diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp index 51a2d9586e..b429aa095e 100644 --- a/engines/mads/nebular/nebular_scenes1.cpp +++ b/engines/mads/nebular/nebular_scenes1.cpp @@ -278,8 +278,7 @@ void Scene103::actions() { default: break; } - } - else if (_action.isAction(VERB_TAKE, 371) && _game._objects.isInRoom(OBJ_TIMER_MODULE)) { + } else if (_action.isAction(VERB_TAKE, 371) && _game._objects.isInRoom(OBJ_TIMER_MODULE)) { switch (_vm->_game->_trigger) { case 0: _scene->changeDepthSurface(1); @@ -370,8 +369,7 @@ void Scene103::actions() { } } else if (_action.isAction(VERB_LOOK, 250)) { _vm->_dialogs->show(!_globals[kTurkeyExploded] ? 10323 : 10303); - } - else if (_action.isAction(VERB_TALKTO, 27)) { + } else if (_action.isAction(VERB_TALKTO, 27)) { switch (_vm->_game->_trigger) { case 0: { _game._player._stepEnabled = false; |