[Scummvm-git-logs] scummvm master -> e1c6d4485ddc2d101ddab6cbc25bdb44535c6c52

[bgK]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3d2509a89c MOHAWK: MYST: Reset the main cursor when starting the credits
e1c6d4485d MOHAWK: MYST: Don't play the credits when quitting in the middle of a script


Commit: 3d2509a89c1a1fa668532ed71c99b21a255e7046
    https://github.com/scummvm/scummvm/commit/3d2509a89c1a1fa668532ed71c99b21a255e7046
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-04-26T22:12:58+02:00

Commit Message:
MOHAWK: MYST: Reset the main cursor when starting the credits

The credit stack does not have the data required to display all the
cursors, especially the page cursors.

Fixes Trac#10501.

Changed paths:
    engines/mohawk/myst_stacks/credits.cpp


diff --git a/engines/mohawk/myst_stacks/credits.cpp b/engines/mohawk/myst_stacks/credits.cpp
index 2d3b366..5daa73d 100644
--- a/engines/mohawk/myst_stacks/credits.cpp
+++ b/engines/mohawk/myst_stacks/credits.cpp
@@ -23,6 +23,7 @@
 #include "mohawk/myst.h"
 #include "mohawk/myst_areas.h"
 #include "mohawk/myst_graphics.h"
+#include "mohawk/cursors.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
 #include "mohawk/myst_stacks/credits.h"
@@ -89,6 +90,10 @@ uint16 Credits::getVar(uint16 var) {
 }
 
 void Credits::o_runCredits(uint16 var, const ArgumentsArray &args) {
+	// The credits stack does not have all the cursors, reset to the default cursor.
+	_globals.heldPage = kNoPage;
+	_vm->setMainCursor(kDefaultMystCursor);
+
 	// Activate the credits
 	_creditsRunning = true;
 	_curImage = 0;


Commit: e1c6d4485ddc2d101ddab6cbc25bdb44535c6c52
    https://github.com/scummvm/scummvm/commit/e1c6d4485ddc2d101ddab6cbc25bdb44535c6c52
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-04-26T22:14:37+02:00

Commit Message:
MOHAWK: MYST: Don't play the credits when quitting in the middle of a script

Playing the credits unloads the data required by the rest of the script.

Fixes Trac#10502.

Changed paths:
    engines/mohawk/myst.cpp


diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index b86e337..c0e3405 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -446,9 +446,16 @@ void MohawkEngine_Myst::doFrame() {
 						}
 
 						if (_needsShowCredits) {
-							_cursor->hideCursor();
-							changeToStack(kCreditsStack, 10000, 0, 0);
-							_needsShowCredits = false;
+							if (_interactive) {
+								_cursor->hideCursor();
+								changeToStack(kCreditsStack, 10000, 0, 0);
+								_needsShowCredits = false;
+							} else {
+								// Showing the credits in the middle of a script is not possible
+								// because it unloads the previous age, removing data needed by the
+								// rest of the script. Instead we just quit without showing the credits.
+								quitGame();
+							}
 						}
 						break;
 					case Common::KEYCODE_ESCAPE: