[Scummvm-git-logs] scummvm master -> 46c9c9f0c123c76d69d38fef69f71f0b26289e1c

[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:
46c9c9f0c1 XEEN: Properly reset subtitles when replaying cutscenes


Commit: 46c9c9f0c123c76d69d38fef69f71f0b26289e1c
    https://github.com/scummvm/scummvm/commit/46c9c9f0c123c76d69d38fef69f71f0b26289e1c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-05-30T18:00:39-04:00

Commit Message:
XEEN: Properly reset subtitles when replaying cutscenes

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


diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
index dd87f58..2ae921c 100644
--- a/engines/xeen/worldofxeen/clouds_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
@@ -42,6 +42,7 @@ bool CloudsCutscenes::showCloudsIntro() {
 	bool darkCc = files._ccNum;
 	files.setGameCc(0);
 	sound._musicSide = 0;
+	_subtitles.reset();
 
 	bool seenIntro = showCloudsTitle() && showCloudsIntroInner();
 
@@ -381,6 +382,7 @@ void CloudsCutscenes::showCloudsEnding(uint finalScore) {
 
 	bool darkCc = files._ccNum;
 	files.setGameCc(0);
+	_subtitles.reset();
 
 	_mirror.load("mirror.end");
 	_mirrBack.load("mirrback.end");
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
index db9254f..c0ef2e9 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
@@ -74,6 +74,7 @@ bool DarkSideCutscenes::showDarkSideTitle(bool seenIntro) {
 	Screen &screen = *g_vm->_screen;
 	Sound &sound = *g_vm->_sound;
 	g_vm->_files->_ccNum = true;
+	_subtitles.reset();
 
 	screen.loadPalette("dark.pal");
 	SpriteResource nwc[4] = {
@@ -169,6 +170,7 @@ bool DarkSideCutscenes::showDarkSideIntro(bool seenIntro) {
 
 	files._ccNum = true;
 	files.setGameCc(1);
+	_subtitles.reset();
 
 	if (showDarkSideTitle(seenIntro)) {
 		if (seenIntro) {
@@ -836,6 +838,7 @@ void DarkSideCutscenes::showDarkSideEnding(uint endingScore) {
 	Sound &sound = *g_vm->_sound;
 
 	files.setGameCc(1);
+	_subtitles.reset();
 	sound._musicSide = 1;
 	screen.fadeOut();