diff options
| author | Bastien Bouclet | 2018-07-13 19:31:56 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2018-07-13 19:44:48 +0200 |
| commit | d91ac014195dea06e42daa7351c9a3844ef34aec (patch) | |
| tree | 8e8c2bd56b169f8f1f1970a48b1b43320954b302 /engines/mohawk/riven_stacks | |
| parent | 788574e751f89096ba580306818e5d999db9c016 (diff) | |
| download | scummvm-rg350-d91ac014195dea06e42daa7351c9a3844ef34aec.tar.gz scummvm-rg350-d91ac014195dea06e42daa7351c9a3844ef34aec.tar.bz2 scummvm-rg350-d91ac014195dea06e42daa7351c9a3844ef34aec.zip | |
MOHAWK: RIVEN: Queue opening and closing the main menu as scripts
This way all the other actions are blocked while the card load scripts
are executed. Expecially, it's not possible anymore to open the main
menu while the scripts for returning from the main menu are still
executing.
Fixes Trac#10628.
Diffstat (limited to 'engines/mohawk/riven_stacks')
| -rw-r--r-- | engines/mohawk/riven_stacks/aspit.cpp | 2 | ||||
| -rw-r--r-- | engines/mohawk/riven_stacks/ospit.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/mohawk/riven_stacks/aspit.cpp b/engines/mohawk/riven_stacks/aspit.cpp index a94b454257..59cc3b9912 100644 --- a/engines/mohawk/riven_stacks/aspit.cpp +++ b/engines/mohawk/riven_stacks/aspit.cpp @@ -424,7 +424,7 @@ void ASpit::xaNewGame(const ArgumentArray &args) { kRivenCommandTransition, 1, kRivenTransitionBlend, kRivenCommandChangeCard, 1, 2); - script->addCommand(RivenCommandPtr(new RivenStackChangeCommand(_vm, 0, 0x6E9A, false))); + script->addCommand(RivenCommandPtr(new RivenStackChangeCommand(_vm, 0, 0x6E9A, false, false))); script += _vm->_scriptMan->createScriptFromData(1, kRivenCommandStopSound, 1, 2); diff --git a/engines/mohawk/riven_stacks/ospit.cpp b/engines/mohawk/riven_stacks/ospit.cpp index d939beacba..f44bc0d8ac 100644 --- a/engines/mohawk/riven_stacks/ospit.cpp +++ b/engines/mohawk/riven_stacks/ospit.cpp @@ -51,7 +51,7 @@ void OSpit::xorollcredittime(const ArgumentArray &args) { // we should be using the Tay end game sequences. if (_vm->_vars["returnstackid"] == kStackRspit) { RivenScriptPtr script = _vm->_scriptMan->createScriptWithCommand( - new RivenStackChangeCommand(_vm, kStackRspit, 0x3338, true)); + new RivenStackChangeCommand(_vm, kStackRspit, 0x3338, true, false)); _vm->_scriptMan->runScript(script, false); return; } |