[Scummvm-git-logs] scummvm master -> 082def7ccd4506dc81041f21f3a2a9adaf455637

[dreammaster]

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

Summary:
082def7ccd XEEN: Go to menu rather than intro title when game is exitted


Commit: 082def7ccd4506dc81041f21f3a2a9adaf455637
    https://github.com/scummvm/scummvm/commit/082def7ccd4506dc81041f21f3a2a9adaf455637
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-16T21:41:19-04:00

Commit Message:
XEEN: Go to menu rather than intro title when game is exitted

Changed paths:
    engines/xeen/worldofxeen/worldofxeen_menu.cpp
    engines/xeen/xeen.cpp


diff --git a/engines/xeen/worldofxeen/worldofxeen_menu.cpp b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
index 3e4e144..8356794 100644
--- a/engines/xeen/worldofxeen/worldofxeen_menu.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
@@ -53,6 +53,7 @@ void MainMenuContainer::show() {
 
 MainMenuContainer::MainMenuContainer(const Common::String &spritesName, uint frameCount) :
 		_frameCount(frameCount), _animateCtr(0), _dialog(nullptr) {
+	g_vm->_files->setGameCc(g_vm->getGameID() == GType_Clouds ? 0 : 1);
 	_backgroundSprites.load(spritesName);
 }
 
diff --git a/engines/xeen/xeen.cpp b/engines/xeen/xeen.cpp
index c8fb40d..b7b87af 100644
--- a/engines/xeen/xeen.cpp
+++ b/engines/xeen/xeen.cpp
@@ -243,6 +243,7 @@ void XeenEngine::play() {
 		death();
 
 	_mode = MODE_STARTUP;
+	_gameMode = GMODE_MENU;
 }
 
 void XeenEngine::gameLoop() {