aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2018-05-30 18:00:39 -0400
committerPaul Gilbert2018-05-30 18:00:39 -0400
commit46c9c9f0c123c76d69d38fef69f71f0b26289e1c (patch)
tree9616a578c1dc471ee702b5239b788d2161cdf6c4
parent88ed76322d44a7c3cf5eeda8802aadafd48abf0b (diff)
downloadscummvm-rg350-46c9c9f0c123c76d69d38fef69f71f0b26289e1c.tar.gz
scummvm-rg350-46c9c9f0c123c76d69d38fef69f71f0b26289e1c.tar.bz2
scummvm-rg350-46c9c9f0c123c76d69d38fef69f71f0b26289e1c.zip
XEEN: Properly reset subtitles when replaying cutscenes
-rw-r--r--engines/xeen/worldofxeen/clouds_cutscenes.cpp2
-rw-r--r--engines/xeen/worldofxeen/darkside_cutscenes.cpp3
2 files changed, 5 insertions, 0 deletions
diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
index dd87f5807a..2ae921cf19 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 db9254f067..c0ef2e98d7 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();