aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen/worldofxeen
diff options
context:
space:
mode:
authorPaul Gilbert2018-07-26 18:54:17 -0700
committerPaul Gilbert2018-07-26 18:54:17 -0700
commit560f10c346d618caa6bdcc42647f691d6ab26fd0 (patch)
tree8fa9741216a0f9071b27f2672eda8c52f2821622 /engines/xeen/worldofxeen
parent877b4e5cf3bd9c40cb1177a2f5a1cc452d3fcebf (diff)
downloadscummvm-rg350-560f10c346d618caa6bdcc42647f691d6ab26fd0.tar.gz
scummvm-rg350-560f10c346d618caa6bdcc42647f691d6ab26fd0.tar.bz2
scummvm-rg350-560f10c346d618caa6bdcc42647f691d6ab26fd0.zip
XEEN: Fix Coverity warnings
Diffstat (limited to 'engines/xeen/worldofxeen')
-rw-r--r--engines/xeen/worldofxeen/clouds_cutscenes.h2
-rw-r--r--engines/xeen/worldofxeen/darkside_cutscenes.cpp5
2 files changed, 1 insertions, 6 deletions
diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.h b/engines/xeen/worldofxeen/clouds_cutscenes.h
index 39fded63ea..821ded44b9 100644
--- a/engines/xeen/worldofxeen/clouds_cutscenes.h
+++ b/engines/xeen/worldofxeen/clouds_cutscenes.h
@@ -81,7 +81,7 @@ private:
*/
bool showCloudsEnding5();
public:
- CloudsCutscenes(XeenEngine *vm) : Cutscenes(vm) {}
+ CloudsCutscenes(XeenEngine *vm) : Cutscenes(vm), _mergeX(0) {}
/**
* Shows the Clouds of Xeen intro sequence
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
index c0ef2e98d7..3e21d21b25 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
@@ -627,11 +627,6 @@ bool DarkSideCutscenes::showDarkSideIntro2() {
wizard.draw(0, 0, Common::Point(9, 57));
fizzle.draw(0, idx, Common::Point(9, 57));
- if (!sound.isSoundPlaying() && !vocIndex) {
- sound.playVoice("pharoh7t.voc");
- vocIndex = 1;
- }
-
_subtitles.show();
WAIT(3);
}