aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2014-04-05 17:50:58 -0400
committerPaul Gilbert2014-04-05 17:50:58 -0400
commitd3bc036a46ea83a0bd5a4d16577740b25e8eaec4 (patch)
tree6b72c28de6e93559c61853019a38b69acfa1b60e
parent3b27d99c397d6dca2485d50064c7529be1a44f19 (diff)
downloadscummvm-rg350-d3bc036a46ea83a0bd5a4d16577740b25e8eaec4.tar.gz
scummvm-rg350-d3bc036a46ea83a0bd5a4d16577740b25e8eaec4.tar.bz2
scummvm-rg350-d3bc036a46ea83a0bd5a4d16577740b25e8eaec4.zip
MADS: Fix display of dialog at end of taking turkey explosion sequence
-rw-r--r--engines/mads/nebular/dialogs_nebular.cpp1
-rw-r--r--engines/mads/nebular/nebular_scenes1.cpp7
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index ff25696f5d..871e10416d 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -234,6 +234,7 @@ bool DialogsNebular::show(int msgId) {
dialog->incNumLines();
// Show the dialog
+ _vm->_events->setCursor(CURSOR_ARROW);
dialog->show();
delete dialog;
diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index 7cc4fb36fb..5e4d1691a8 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -335,18 +335,21 @@ void Scene103::actions() {
if (_vm->_game->_fx < 2) {
_globals._spriteIndexes[24] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[9], false, 6, _vm->_game->_trigger < 1 ? 1 : 0);
if (_vm->_game->_trigger) {
+ // Rex says "Gads.."
_scene->_sequences.setAnimRange(_globals._spriteIndexes[24], -1, 0);
Common::String msg = _game.getQuote(51);
_scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 18, 0, 60, msg);
- _scene->_sequences.addTimer(120, _vm->_game->_trigger);
+ _scene->_sequences.addTimer(120, _vm->_game->_trigger + 1);
} else {
+ // Start initial explosion
_scene->_sequences.addSubEntry(_globals._spriteIndexes[24], SM_0, 0, 1);
}
_game._player._stepEnabled = _game._trigger == 2;
_globals[kTurkeyExploded] = -1;
if (_game._trigger == 2) {
- _vm->_dialogs->show(1030);
+ // Show exposition dialog
+ _vm->_dialogs->show(10302);
_scene->_hotspots.activate(362, false);
}
}