XEEN: Change setMusicVolume to setMusicPercent for better range clarity

2 files changed, 11 insertions, 13 deletions

diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
index 436abb3b42..6662cbae29 100644
--- a/engines/xeen/worldofxeen/clouds_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
@@ -44,7 +44,6 @@ bool CloudsCutscenes::showCloudsIntro() {
 	bool seenIntro = showCloudsTitle() && showCloudsIntroInner();
 
 	sound.stopAllAudio();
-	sound.setMusicVolume(100);
 	screen.freePages();
 
 	return seenIntro;
@@ -247,7 +246,7 @@ bool CloudsCutscenes::showCloudsIntroInner() {
 	if (doScroll(false, true))
 		return false;
 
-	sound.setMusicVolume(75);
+	sound.setMusicPercent(60);
 	screen.restoreBackground();
 	screen.update();
 	resetSubtitles(0, 1);
@@ -523,7 +522,7 @@ bool CloudsCutscenes::showCloudsEnding1() {
 
 		WAIT(3);
 	}
-	sound.setMusicVolume(75);
+	sound.setMusicPercent(60);
 
 	// Alamar's monologue
 	for (int idx = 0; idx < 3; ++idx) {
@@ -570,7 +569,7 @@ bool CloudsCutscenes::showCloudsEnding1() {
 
 	// Laugh
 	sound.playSound("darklaff.voc");
-	sound.setMusicVolume(95);
+	sound.setMusicPercent(75);
 
 	// Alamar fade out
 	for (int idx = 12; idx >= 0; --idx) {
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
index 171ce06f2a..488161edae 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
@@ -95,7 +95,7 @@ bool DarkSideCutscenes::showDarkSideTitle(bool seenIntro) {
 	screen.horizMerge(0);
 	screen.fadeIn();
 
-	sound.setMusicVolume(0x5f);
+	sound.setMusicPercent(75);
 	sound.playFX(1);
 
 	// Initial loop for dragon roaring
@@ -191,7 +191,6 @@ bool DarkSideCutscenes::showDarkSideIntro(bool seenIntro) {
 	}
 
 	sound.stopAllAudio();
-	sound.setMusicVolume(100);
 	screen.freePages();
 
 	return seenIntro;
@@ -247,7 +246,7 @@ bool DarkSideCutscenes::showDarkSideIntro1() {
 	};
 
 	// Play the intro music
-	sound.setMusicVolume(95);
+	sound.setMusicPercent(75);
 	sound.playSong("bigtheme.m");
 
 	screen.loadBackground("jvc.raw");
@@ -299,7 +298,7 @@ bool DarkSideCutscenes::showDarkSideIntro1() {
 	screen.saveBackground();
 	screen.freePages();
 
-	WAIT(30);
+	WAIT(20);
 
 	// Zoom into the Pharoah's base closeup view
 	for (int idx = 14; idx >= 0 && !_vm->shouldExit(); --idx) {
@@ -307,7 +306,7 @@ bool DarkSideCutscenes::showDarkSideIntro1() {
 		pyraTop.draw(0, 1, Common::Point(XLIST2[idx], YLIST1[idx]), 0, idx);
 
 		if (idx == 2)
-			sound.setMusicVolume(48);
+			sound.setMusicPercent(38);
 		WAIT(2);
 	}
 
@@ -724,7 +723,7 @@ bool DarkSideCutscenes::showDarkSideIntro3() {
 
 	sound.playFX(0);
 	screen.fadeOut();
-	sound.setMusicVolume(95);
+	sound.setMusicPercent(75);
 	screen.loadBackground("bird.raw");
 	screen.saveBackground();
 	screen.fadeIn();
@@ -1193,7 +1192,7 @@ bool DarkSideCutscenes::showDarkSideEnding2() {
 
 	// Closeup of side of Alamar's helmet
 	SpriteResource sc11("sc11.end");
-	sound.setMusicVolume(95);
+	sound.setMusicPercent(75);
 	sound.playSong("dngon2.m");
 	screen.fadeOut();
 	screen.loadBackground("blank.raw");
@@ -1241,7 +1240,7 @@ bool DarkSideCutscenes::showDarkSideEnding2() {
 	// I'm ready for you this time
 	SpriteResource sc13("sc13.end");
 	resetSubtitles(26);
-	sound.setMusicVolume(48);
+	sound.setMusicPercent(38);
 
 	for (int idx = 0; idx < 16; ++idx) {
 		if (idx == 1)
@@ -1430,7 +1429,7 @@ bool DarkSideCutscenes::showDarkSideEnding3() {
 
 	// Corak waving his hands
 	SpriteResource sc20("sc20.end");
-	sound.setMusicVolume(95);
+	sound.setMusicPercent(75);
 	sound.playSong("sf17.m");
 	screen.loadBackground("blank.raw");
 	screen.saveBackground();