XEEN: Subtitle improvements, set up correct subtitles for Darkside intro

5 files changed, 18 insertions, 49 deletions

diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
index 89a54c6836..27f09f7b7f 100644
--- a/engines/xeen/worldofxeen/clouds_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
@@ -50,7 +50,6 @@ bool CloudsCutscenes::showCloudsIntro() {
 }
 
 bool CloudsCutscenes::showCloudsTitle() {
-	EventsManager &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
 
@@ -379,7 +378,6 @@ void CloudsCutscenes::showCloudsEnding(uint finalScore) {
 }
 
 bool CloudsCutscenes::showCloudsEnding1() {
-	EventsManager &events = *_vm->_events;
 	FileManager &files = *_vm->_files;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
@@ -561,7 +559,7 @@ bool CloudsCutscenes::showCloudsEnding1() {
 				break;
 			}
 
-			_subtitles.show(0);
+			_subtitles.show();
 			WAIT(3);
 		} while (sound.isSoundPlaying() || _subtitles.active());
 	}
@@ -608,7 +606,6 @@ bool CloudsCutscenes::showCloudsEnding1() {
 }
 
 bool CloudsCutscenes::showCloudsEnding2() {
-	EventsManager &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
 
@@ -707,7 +704,6 @@ const int8 XARRAY[8] = { -2, -1, 0, 1, 2, 1, 0, -1 };
 const int8 YARRAY[8] = { -2, 0, 2, 0, -1, 0, 2, 0 };
 
 bool CloudsCutscenes::showCloudsEnding3() {
-	EventsManager &events = *_vm->_events;
 	Map &map = *_vm->_map;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
@@ -949,7 +945,6 @@ bool CloudsCutscenes::showCloudsEnding4(uint finalScore) {
 }
 
 bool CloudsCutscenes::showCloudsEnding5() {
-	EventsManager &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
 	SpriteResource king("king.end");
diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.h b/engines/xeen/worldofxeen/clouds_cutscenes.h
index 39fded63ea..dd632ebf8f 100644
--- a/engines/xeen/worldofxeen/clouds_cutscenes.h
+++ b/engines/xeen/worldofxeen/clouds_cutscenes.h
@@ -39,7 +39,6 @@ private:
 	static const byte _DECODE_TABLE1[256];
 	static const byte _DECODE_TABLE2[256];
 private:
-	Subtitles _subtitles;
 	SpriteResource _mirror, _mirrBack;
 	int _mergeX;
 private:
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
index 8886afeaa7..88f148d5a5 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
@@ -70,7 +70,6 @@ const int LEFT_CLAW_IDLE_Y[32] = {
 
 
 bool DarkSideCutscenes::showDarkSideTitle(bool seenIntro) {
-	EventsManager &events = *g_vm->_events;
 	Screen &screen = *g_vm->_screen;
 	Sound &sound = *g_vm->_sound;
 	g_vm->_files->_isDarkCc = true;
@@ -197,7 +196,6 @@ bool DarkSideCutscenes::showDarkSideIntro(bool seenIntro) {
 }
 
 bool DarkSideCutscenes::rubCrystalBall(bool fadeIn) {
-	EventsManager &events = *g_vm->_events;
 	Screen &screen = *g_vm->_screen;
 
 	for (int frame = 0; frame < 32; ++frame) {
@@ -363,9 +361,6 @@ bool DarkSideCutscenes::showDarkSideIntro1() {
 		screen.horizMerge(idx);
 		dragon.draw(0, FRAMES3[frameNum], Common::Point(XLIST3[posNum], YLIST3[posNum]), SPRFLAG_800);
 		_subtitles.show();
-		events.pollEventsAndWait();
-		if (events.isKeyMousePressed())
-			return false;
 
 		if (idx == SCREEN_WIDTH)
 			sound.playSound(PHAR_VOC[0]);
@@ -402,7 +397,6 @@ bool DarkSideCutscenes::showDarkSideIntro1() {
 	clawCtr = (clawCtr + 1) % 32
 
 bool DarkSideCutscenes::showDarkSideIntro2() {
-	EventsManager &events = *g_vm->_events;
 	Screen &screen = *g_vm->_screen;
 	Sound &sound = *g_vm->_sound;
 	SpriteResource goon("goon.int"), darkLord("darklord.int"), queen("queen.int"),
@@ -416,8 +410,8 @@ bool DarkSideCutscenes::showDarkSideIntro2() {
 	if (!rubCrystalBall(true))
 		return false;
 
-	// TODO: Subtitle stuff
-	_subtitles.setLine(1);
+	// Queen Kalindra?
+	_subtitles.setLine(9);
 	sound.playFX(42);
 
 	for (idx = 0, clawCtr = 0; idx < 11; ++idx) {
@@ -444,7 +438,7 @@ bool DarkSideCutscenes::showDarkSideIntro2() {
 		if (!sound.isSoundPlaying() && vocIndex < 3) {
 			if (!_subtitles.active()) {
 				if (!vocIndex)
-					_subtitles.setLine(9 + vocIndex);
+					_subtitles.setLine(10);
 
 				sound.playSound(VOC_NAMES[vocIndex++]);
 				if (vocIndex == 3)
@@ -467,7 +461,7 @@ bool DarkSideCutscenes::showDarkSideIntro2() {
 	} while (vocIndex < 3 || sound.isSoundPlaying() || _subtitles.active());
 
 	sound.playSound(VOC_NAMES[3]);
-	_subtitles.setLine(10);
+	_subtitles.setLine(11);
 
 	idx = 34;
 	do {
@@ -481,8 +475,7 @@ bool DarkSideCutscenes::showDarkSideIntro2() {
 		WAIT(3);
 	} while (sound.isSoundPlaying() || _subtitles.active());
 
-	// TODO: Subtitle stuff
-	_subtitles.setLine(0);
+	_subtitles.setLine(12);
 	sound.playSound("dark3.voc");
 
 	const char *const VOC_NAMES2[2] = { "pharoh5a.voc", "pharoh5b.voc" };
@@ -494,13 +487,13 @@ bool DarkSideCutscenes::showDarkSideIntro2() {
 
 		_subtitles.show();
 		WAIT(3);
-		if (!sound.isSoundPlaying() && vocIndex < 2)
+		if (!sound.isSoundPlaying() && vocIndex < 2) {
+			if (vocIndex)
+				_subtitles.setLine(13);
 			sound.playSound(VOC_NAMES2[vocIndex++]);
+		}
 	} while (vocIndex < 2 || sound.isSoundPlaying() || _subtitles.active());
 
-	// TODO: Subtitle stuff
-	_subtitles.setLine(0);
-
 	sound.playFX(42);
 	vocIndex = 0;
 
@@ -548,14 +541,14 @@ bool DarkSideCutscenes::showDarkSideIntro2() {
 
 	const char *const VOC_NAMES3[2] = { "alamar1.voc", "pharoh7t.voc" };
 	vocIndex = nwcIndex = 0;
+	_subtitles.setLine(14);
 
 	do {
 		ANIMATE_PHAROAH;
 		goon.draw(0, (vocIndex == 0) ? 0 : nwcIndex, Common::Point(9, 57));
 
 		if (!sound.isSoundPlaying() && !vocIndex && !_subtitles.active()) {
-			// TODO: Subtitles stuff
-			_subtitles.setLine(0);
+			_subtitles.setLine(15);
 			sound.playSound(VOC_NAMES3[vocIndex++]);
 			sound.playFX(0);
 		}
@@ -565,8 +558,7 @@ bool DarkSideCutscenes::showDarkSideIntro2() {
 		WAIT(3);
 	} while (!vocIndex || sound.isSoundPlaying() || _subtitles.active());
 
-	// TODO: Subtitle stuff
-	_subtitles.setLine(0);
+	_subtitles.setLine(16);
 	sound.playFX(42);
 
 	for (idx = 10, vocIndex = 0; idx >= 0; --idx) {
@@ -589,8 +581,7 @@ bool DarkSideCutscenes::showDarkSideIntro2() {
 	if (!rubCrystalBall())
 		return false;
 
-	// TODO: Subtitle stuff
-	_subtitles.setLine(0);
+	_subtitles.setLine(17);
 
 	for (idx = 0, clawCtr = 0; idx < 11; ++idx) {
 		ANIMATE_PHAROAH;
@@ -615,13 +606,7 @@ bool DarkSideCutscenes::showDarkSideIntro2() {
 		wizard.draw(0, (vocIndex == 1) ? getSpeakingFrame(0, 3) : 0, Common::Point(9, 57));
 
 		if (!sound.isSoundPlaying() && vocIndex < 2 && !_subtitles.active()) {
-			// TODO: Subtitle stuff
-			if (vocIndex == 0) {
-				_subtitles.setLine(0);
-			} else {
-				_subtitles.setLine(0);
-			}
-
+			_subtitles.setLine((vocIndex == 0) ? 18 : 19);
 			sound.playSound(VOC_NAMES4[vocIndex++]);
 			sound.playFX(0);
 		}
@@ -647,8 +632,7 @@ bool DarkSideCutscenes::showDarkSideIntro2() {
 		WAIT(3);
 	}
 
-	// TODO: Subtitle stuff
-	_subtitles.setLine(0);
+	_subtitles.setLine(20);
 	vocIndex = 0;
 
 	do {
@@ -670,7 +654,6 @@ bool DarkSideCutscenes::showDarkSideIntro2() {
 }
 
 bool DarkSideCutscenes::showDarkSideIntro3() {
-	EventsManager &events = *g_vm->_events;
 	Screen &screen = *g_vm->_screen;
 	Sound &sound = *g_vm->_sound;
 	SpriteResource fly("fly.int");
@@ -685,8 +668,7 @@ bool DarkSideCutscenes::showDarkSideIntro3() {
 	screen.loadBackground("fly.raw");
 	screen.saveBackground();
 
-	// TODO: Subtitle stuff
-	_subtitles.setLine(0);
+	_subtitles.setLine(6);
 	_subtitles.show();
 
 	screen.fadeIn();
@@ -794,7 +776,6 @@ bool DarkSideCutscenes::showDarkSideIntro3() {
 }
 
 bool DarkSideCutscenes::showWorldOfXeenLogo() {
-	EventsManager &events = *g_vm->_events;
 	Screen &screen = *g_vm->_screen;
 	Sound &sound = *g_vm->_sound;
 	SpriteResource fizzle("fizzle.int");
@@ -1276,7 +1257,6 @@ bool DarkSideCutscenes::showDarkSideEnding2() {
 }
 
 bool DarkSideCutscenes::showDarkSideEnding3() {
-	EventsManager &events = *g_vm->_events;
 	Screen &screen = *g_vm->_screen;
 	Sound &sound = *g_vm->_sound;
 
@@ -1583,7 +1563,7 @@ bool DarkSideCutscenes::showDarkSideEnding4() {
 			WAIT(3);
 		}
 	}
-	_subtitles.wait();
+
 	sc25.clear();
 
 	// I do. Kamakazi time
@@ -1633,7 +1613,6 @@ bool DarkSideCutscenes::showDarkSideEnding4() {
 		WAIT(3);
 	}
 
-	_subtitles.wait();
 	sc27.clear();
 
 	// Vortex is opened and the two are sucked in, obliterating them
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.h b/engines/xeen/worldofxeen/darkside_cutscenes.h
index e0bd5c00f8..1808562b11 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.h
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.h
@@ -24,7 +24,6 @@
 #define XEEN_WORLDOFXEEN_DARKSIDE_CUTSCENES_H
 
 #include "xeen/cutscenes.h"
-#include "xeen/subtitles.h"
 
 namespace Xeen {
 
@@ -34,7 +33,6 @@ namespace WorldOfXeen {
 
 class DarkSideCutscenes : public Cutscenes {
 private:
-	Subtitles _subtitles;
 	SpriteResource _ball, _claw, _dragon1;
 private:
 	/**
diff --git a/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp b/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp
index 2ea5827315..13d59c43c9 100644
--- a/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp
@@ -439,7 +439,6 @@ bool WorldOfXeenCutscenes::worldEnding1() {
 }
 
 bool WorldOfXeenCutscenes::worldEnding2() {
-	EventsManager &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
 	Windows &windows = *_vm->_windows;
@@ -590,7 +589,6 @@ bool WorldOfXeenCutscenes::worldEnding2() {
 }
 
 bool WorldOfXeenCutscenes::worldEnding3() {
-	EventsManager &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
 	Windows &windows = *_vm->_windows;