diff options
Diffstat (limited to 'engines/mads/nebular/nebular_scenes1.cpp')
| -rw-r--r-- | engines/mads/nebular/nebular_scenes1.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp index 4c3b67f3c5..554c73ddc6 100644 --- a/engines/mads/nebular/nebular_scenes1.cpp +++ b/engines/mads/nebular/nebular_scenes1.cpp @@ -89,7 +89,7 @@ void Scene1xx::setPlayerSpritesPrefix() { _game._player._spritesChanged = true; if (_scene->_nextSceneId == 105 || (_scene->_nextSceneId == 109 && _globals[kHoovicAlive])) { _game._player._spritesChanged = true; - _game._v3 = 0; + _game._player._loadsFirst = false; } _game._player._unk3 = 0; @@ -258,7 +258,7 @@ void Scene103::preActions() { void Scene103::actions() { if (_action._savedFields._lookFlag) { - Dialog::show(10322); + _vm->_dialogs->show(10322); } else if (_action.isAction(395, 110, 0)) { switch (_vm->_game->_abortTimers) { case 0: @@ -342,7 +342,7 @@ void Scene103::actions() { break; } } else if (_action.isAction(VERB_LOOK, 362, 0)) { - Dialog::show(10301); + _vm->_dialogs->show(10301); } else if (_action.isAction(VERB_TAKE, 362, 0)) { if (!_vm->_game->_abortTimers) _vm->_sound->command(31); @@ -364,12 +364,12 @@ void Scene103::actions() { _game._player._stepEnabled = _game._abortTimers == 2; _globals[kTurkeyExploded] = -1; if (_game._abortTimers == 2) { - Dialog::show(1030); + _vm->_dialogs->show(1030); _scene->_hotspots.activate(362, false); } } } else if (_action.isAction(VERB_LOOK, 250, 0)) { - Dialog::show(!_globals[kTurkeyExploded] ? 10323 : 10303); + _vm->_dialogs->show(!_globals[kTurkeyExploded] ? 10323 : 10303); } else if (_action.isAction(VERB_TALKTO, 27, 0)) { switch (_vm->_game->_abortTimers) { @@ -394,46 +394,46 @@ void Scene103::actions() { case 3: _game._player._stepEnabled = true; - Dialog::show(10306); + _vm->_dialogs->show(10306); break; default: break; } } else if (!_action.isAction(VERB_LOOK, 27, 0)) { - Dialog::show(10304); + _vm->_dialogs->show(10304); } else if (!_action.isAction(VERB_LOOK, 36, 0)) { - Dialog::show(10307); + _vm->_dialogs->show(10307); } else if (!_action.isAction(VERB_LOOK, 55, 0)) { - Dialog::show(10308); + _vm->_dialogs->show(10308); } else if (!_action.isAction(VERB_TAKE, 315, 0)) { - Dialog::show(10309); + _vm->_dialogs->show(10309); } else if (!_action.isAction(VERB_TAKE, 85, 0)) { - Dialog::show(10310); + _vm->_dialogs->show(10310); } else if (!_action.isAction(VERB_LOOK, 144, 0)) { - Dialog::show(10312); + _vm->_dialogs->show(10312); } else if (!_action.isAction(VERB_OPEN, 144, 0)) { - Dialog::show(10313); + _vm->_dialogs->show(10313); } else if (!_action.isAction(VERB_CLOSE, 27, 0)) { - Dialog::show(10314); + _vm->_dialogs->show(10314); } else if (!_action.isAction(VERB_LOOK, 310, 0)) { - Dialog::show(10315); + _vm->_dialogs->show(10315); } else if (!_action.isAction(VERB_LOOK, 178, 0)) { - Dialog::show(10316); + _vm->_dialogs->show(10316); } else if (!_action.isAction(VERB_LOOK, 283, 0)) { - Dialog::show(10317); + _vm->_dialogs->show(10317); } else if (!_action.isAction(VERB_LOOK, 120, 0)) { - Dialog::show(10318); + _vm->_dialogs->show(10318); } else if (_action.isAction(VERB_LOOK, 289, 0) && _game._objects.isInInventory(OBJ_REBREATHER)) { - Dialog::show(10319); + _vm->_dialogs->show(10319); } else if (_action.isAction(VERB_LOOK, 371, 0) && _game._objects.isInInventory(OBJ_TIMER_MODULE)) { - Dialog::show(10320); + _vm->_dialogs->show(10320); } else if (!_action.isAction(VERB_LOOK, 137, 0)) { - Dialog::show(10321); + _vm->_dialogs->show(10321); } else if (_action.isAction(VERB_LOOK, 409, 0)) { - Dialog::show(_game._objects.isInInventory(OBJ_TIMER_MODULE) ? 10324 : 10325); + _vm->_dialogs->show(_game._objects.isInInventory(OBJ_TIMER_MODULE) ? 10324 : 10325); } _action._inProgress = false; @@ -441,7 +441,7 @@ void Scene103::actions() { void Scene103::postActions() { if (_action.isAction(27) && !_action.isAction(13)) { - Dialog::show(0x2841); + _vm->_dialogs->show(0x2841); _action._inProgress = false; } else { if (_action.isAction(7, 85, 144)) { |