From 010c47bfe8aef1234407eda4fb9174627683bb09 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 2 Mar 2018 19:28:47 -0500
Subject: XEEN: Add World of Xeen logo to end of Dark Side intro

---
 engines/xeen/worldofxeen/worldofxeen.cpp | 33 ++++++++------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

(limited to 'engines/xeen/worldofxeen/worldofxeen.cpp')

diff --git a/engines/xeen/worldofxeen/worldofxeen.cpp b/engines/xeen/worldofxeen/worldofxeen.cpp
index 61552eb7e5..88ab3d3c44 100644
--- a/engines/xeen/worldofxeen/worldofxeen.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen.cpp
@@ -161,14 +161,6 @@ void WorldOfXeenEngine::showCutscene(const Common::String &name, int status, uin
 		showDarkSideEnding(score);
 	else if (name == "WORLDEND")
 		showWorldOfXeenEnding((GooberState)status, score);
-	else if (name == "CLOUDS_TITLE")
-		showCloudsTitle();
-	else if (name == "CLOUDS_INTRO")
-		showCloudsIntro();
-	else if (name == "DARKSIDE_TITLE")
-		showDarkSideTitle();
-	else if (name == "DARKSIDE_INTRO")
-		showDarkSideIntro();
 
 	_screen->freePages();
 	_sound->stopAllAudio();
@@ -178,25 +170,16 @@ void WorldOfXeenEngine::showCutscene(const Common::String &name, int status, uin
 
 void WorldOfXeenEngine::showStartup() {
 	bool seenIntro = ConfMan.hasKey("seen_intro") && ConfMan.getBool("seen_intro");
+	bool completedIntro;
 
-	// Show the title animation
-	bool completedTitle = true;
-	//(getGameID() == GType_Clouds) ?
-	//	showCloudsTitle() : showDarkSideTitle();
-	_sound->stopAllAudio();
+	if (getGameID() == GType_Clouds)
+		completedIntro = showCloudsIntro();
+	else
+		completedIntro = showDarkSideIntro(seenIntro);
 
-	// Unless user aborted the title, go
-	if (completedTitle && !seenIntro) {
-		if (getGameID() == GType_Clouds)
-			seenIntro = showCloudsIntro();
-		else
-			seenIntro = showDarkSideIntro();
-
-		seenIntro = false;//****DEBUG****
-		if (seenIntro) {
-			ConfMan.setBool("seen_intro", true);
-			ConfMan.flushToDisk();
-		}
+	if (!seenIntro && completedIntro) {
+		ConfMan.setBool("seen_intro", true);
+		ConfMan.flushToDisk();
 	}
 
 	_gameMode = GMODE_MENU;
-- 
cgit v1.2.3