[Scummvm-git-logs] scummvm master -> 29b8812af3cafd58c8e39d00427b4f30e7f2ebe1

[dreammaster]

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:
dab044edb0 XEEN: Minor cleanups to outer engine
29b8812af3 XEEN: Don't show game intro if it's already been seen perviously


Commit: dab044edb08d3a571c3b9786c54540d576af203e
    https://github.com/scummvm/scummvm/commit/dab044edb08d3a571c3b9786c54540d576af203e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-02-26T19:20:34-05:00

Commit Message:
XEEN: Minor cleanups to outer engine

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


diff --git a/engines/xeen/worldofxeen/worldofxeen.cpp b/engines/xeen/worldofxeen/worldofxeen.cpp
index 9403b94..4ea33eb 100644
--- a/engines/xeen/worldofxeen/worldofxeen.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen.cpp
@@ -31,8 +31,6 @@ namespace WorldOfXeen {
 
 WorldOfXeenEngine::WorldOfXeenEngine(OSystem *syst, const XeenGameDescription *gameDesc)
 		: XeenEngine(syst, gameDesc), WorldOfXeenCutscenes(this) {
-	_seenDarkSideIntro = false;
-	_gameMode = GMODE_STARTUP;
 }
 
 void WorldOfXeenEngine::death() {
diff --git a/engines/xeen/worldofxeen/worldofxeen.h b/engines/xeen/worldofxeen/worldofxeen.h
index 08c2e25..773b454 100644
--- a/engines/xeen/worldofxeen/worldofxeen.h
+++ b/engines/xeen/worldofxeen/worldofxeen.h
@@ -51,8 +51,6 @@ protected:
 	 */
 	virtual void death();
 public:
-	bool _seenDarkSideIntro;
-public:
 	WorldOfXeenEngine(OSystem *syst, const XeenGameDescription *gameDesc);
 	virtual ~WorldOfXeenEngine() {}
 
diff --git a/engines/xeen/xeen.cpp b/engines/xeen/xeen.cpp
index e9e27c4..7149b96 100644
--- a/engines/xeen/xeen.cpp
+++ b/engines/xeen/xeen.cpp
@@ -106,7 +106,7 @@ bool XeenEngine::initialize() {
 	_windows = new Windows();
 
 	// Set graphics mode
-	initGraphics(320, 200);
+	initGraphics(SCREEN_WIDTH, SCREEN_HEIGHT);
 
 	// Setup mixer
 	syncSoundSettings();


Commit: 29b8812af3cafd58c8e39d00427b4f30e7f2ebe1
    https://github.com/scummvm/scummvm/commit/29b8812af3cafd58c8e39d00427b4f30e7f2ebe1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-02-26T20:46:39-05:00

Commit Message:
XEEN: Don't show game intro if it's already been seen perviously

Changed paths:
    engines/xeen/worldofxeen/darkside_cutscenes.cpp
    engines/xeen/worldofxeen/darkside_cutscenes.h
    engines/xeen/worldofxeen/worldofxeen.cpp
    engines/xeen/xeen.cpp


diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
index 89ac9c6..904e94e 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
@@ -134,10 +134,18 @@ bool DarkSideCutscenes::showDarkSideTitle() {
 	screen.fadeIn();
 
 	WAIT(60);
+	screen.fadeOut(8);
 	return true;
 }
 
 bool DarkSideCutscenes::showDarkSideIntro() {
+	_vm->_files->_isDarkCc = true;
+	_vm->_files->setGameCc(1);
+
+	return showDarkSideIntro1();
+}
+
+bool DarkSideCutscenes::showDarkSideIntro1() {
 	EventsManager &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
@@ -151,15 +159,13 @@ bool DarkSideCutscenes::showDarkSideIntro() {
 		160, 155, 150, 145, 140, 135, 130, 125, 120, 115, 110, 105, 98, 90, 82
 	};
 
-	_vm->_files->_isDarkCc = true;
 	_subtitles.load("special.bin");
-	screen.fadeOut(8);
 	screen.loadPalette("dark.pal");
 	screen.loadBackground("pyramid2.raw");
 	screen.loadPage(0);
 	screen.loadPage(1);
 	screen.loadBackground("pyramid3.raw");
-	screen.saveBackground(1);
+	screen.saveBackground();
 
 	SpriteResource title("title.int");
 	SpriteResource pyraTop("pyratop.int");
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.h b/engines/xeen/worldofxeen/darkside_cutscenes.h
index f2dd5c5..c16a67f 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.h
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.h
@@ -34,22 +34,27 @@ namespace WorldOfXeen {
 class DarkSideCutscenes : public Cutscenes {
 private:
 	/**
-	 * Shows the part 1 of the Dark Side ending, everything up to Corak appearing
+	 * Shows part 1 of the Dark Side intro
+	 */
+	bool showDarkSideIntro1();
+
+	/**
+	 * Shows part 1 of the Dark Side ending, everything up to Corak appearing
 	 */
 	bool showDarkSideEnding1();
 
 	/**
-	 * Shows the part 2 of the Dark Side ending, exposition until start of fighting
+	 * Shows part 2 of the Dark Side ending, exposition until start of fighting
 	 */
 	bool showDarkSideEnding2();
 
 	/**
-	 * Shows the part 3 of the Dark Side ending, the fighting
+	 * Shows part 3 of the Dark Side ending, the fighting
 	 */
 	bool showDarkSideEnding3();
 
 	/**
-	 * Shows the part 4 of the Dark Side ending, the self-destruct and castle explosion
+	 * Shows part 4 of the Dark Side ending, the self-destruct and castle explosion
 	 */
 	bool showDarkSideEnding4();
 
diff --git a/engines/xeen/worldofxeen/worldofxeen.cpp b/engines/xeen/worldofxeen/worldofxeen.cpp
index 4ea33eb..f0fb5b9 100644
--- a/engines/xeen/worldofxeen/worldofxeen.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen.cpp
@@ -25,6 +25,7 @@
 #include "xeen/worldofxeen/clouds_cutscenes.h"
 #include "xeen/worldofxeen/worldofxeen_menu.h"
 #include "xeen/sound.h"
+#include "common/config-manager.h"
 
 namespace Xeen {
 namespace WorldOfXeen {
@@ -176,12 +177,22 @@ void WorldOfXeenEngine::showCutscene(const Common::String &name, int status, uin
 }
 
 void WorldOfXeenEngine::showStartup() {
-	if (getGameID() == GType_Clouds) {
-		if (showCloudsTitle())
+	bool seenIntro = ConfMan.hasKey("seen_intro") && ConfMan.getBool("seen_intro");
+
+	// Show the title animation
+	bool completedTitle = (getGameID() == GType_Clouds) ?
+		showCloudsTitle() : showDarkSideTitle();
+	_sound->stopAllAudio();
+
+	// Unless user aborted the title, go
+	if (completedTitle && !seenIntro) {
+		if (getGameID() == GType_Clouds)
 			showCloudsIntro();
-	} else {
-		if (showDarkSideTitle())
+		else
 			showDarkSideIntro();
+
+		ConfMan.setBool("seen_intro", true);
+		ConfMan.flushToDisk();
 	}
 
 	_gameMode = GMODE_MENU;
diff --git a/engines/xeen/xeen.cpp b/engines/xeen/xeen.cpp
index 7149b96..13c831b 100644
--- a/engines/xeen/xeen.cpp
+++ b/engines/xeen/xeen.cpp
@@ -190,8 +190,6 @@ void XeenEngine::playGame() {
 }
 
 void XeenEngine::play() {
-	_gameMode = GMODE_NONE;
-
 	_interface->setup();
 	_screen->loadBackground("back.raw");
 	_screen->loadPalette("mm4.pal");