diff options
| author | Paul Gilbert | 2014-04-05 17:19:51 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-04-05 17:19:51 -0400 |
| commit | 0b9c802bf0095568d71db5d10b3b6dbe075934fb (patch) | |
| tree | 0dc144452ccd0e888d15a55ce1ce772794ce78a9 | |
| parent | ecdaf23344725c4bddf5e3dddf80d56140374013 (diff) | |
| download | scummvm-rg350-0b9c802bf0095568d71db5d10b3b6dbe075934fb.tar.gz scummvm-rg350-0b9c802bf0095568d71db5d10b3b6dbe075934fb.tar.bz2 scummvm-rg350-0b9c802bf0095568d71db5d10b3b6dbe075934fb.zip | |
MADS: Fix for actions getting aborted due to _commandError being set
| -rw-r--r-- | engines/mads/nebular/nebular_scenes1.cpp | 4 | ||||
| -rw-r--r-- | engines/mads/scene.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp index c12e7217eb..6d63a564ab 100644 --- a/engines/mads/nebular/nebular_scenes1.cpp +++ b/engines/mads/nebular/nebular_scenes1.cpp @@ -343,6 +343,7 @@ void Scene103::actions() { } else if (_action.isAction(VERB_LOOK, 362)) { _vm->_dialogs->show(10301); } else if (_action.isAction(VERB_TAKE, 362)) { + // Take Turkey if (!_vm->_game->_trigger) _vm->_sound->command(31); @@ -356,8 +357,7 @@ void Scene103::actions() { _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 18, 0, 60, msg); _scene->_sequences.addTimer(120, _vm->_game->_trigger); } else { - _scene->_sequences.addSubEntry(_globals._spriteIndexes[24], - SM_0, 0, 1); + _scene->_sequences.addSubEntry(_globals._spriteIndexes[24], SM_0, 0, 1); } _game._player._stepEnabled = _game._trigger == 2; diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp index 2d95f86636..140077418b 100644 --- a/engines/mads/scene.cpp +++ b/engines/mads/scene.cpp @@ -474,12 +474,12 @@ void Scene::doAction() { } if (!_action._savedFields._lookFlag) { - if (!_action._inProgress) { + if (_action._inProgress) { _action._savedFields._commandError = true; _sceneLogic->postActions(); } - if (!_action._inProgress) { + if (_action._inProgress) { _action._savedFields._commandError = true; warning("TODO: PtrUnk4"); } |