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.

1 files changed, 7 insertions, 4 deletions

diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 5d02317ec0..77d52f9aa5 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -341,15 +341,18 @@ void MohawkEngine_Riven::goToMainMenu() {
 	_menuTumbnail.reset(new Graphics::Surface());
 	createThumbnailFromScreen(_menuTumbnail.get());
 
-	changeToStack(kStackAspit);
-	changeToCard(1);
+	RivenCommand *go = new RivenStackChangeCommand(this, kStackAspit, 1, true, true);
+	RivenScriptPtr goScript = _scriptMan->createScriptWithCommand(go);
+	_scriptMan->runScript(goScript, true);
 }
 
 void MohawkEngine_Riven::resumeFromMainMenu() {
 	assert(_menuSavedStack != -1);
 
-	changeToStack(_menuSavedStack);
-	changeToCard(_menuSavedCard);
+	RivenCommand *resume = new RivenStackChangeCommand(this, _menuSavedStack, _menuSavedCard, true, true);
+	RivenScriptPtr resumeScript = _scriptMan->createScriptWithCommand(resume);
+	_scriptMan->runScript(resumeScript, true);
+
 	_menuSavedStack = -1;
 	_menuSavedCard = -1;
 	_menuTumbnail.reset();