TITANIC: Add a VolumeMode enum

8 files changed, 27 insertions, 27 deletions

diff --git a/engines/titanic/game/credits.cpp b/engines/titanic/game/credits.cpp
index e13a2ce6f4..02c2b08441 100644
--- a/engines/titanic/game/credits.cpp
+++ b/engines/titanic/game/credits.cpp
@@ -62,7 +62,7 @@ bool CCredits::TimerMsg(CTimerMsg *msg) {
 	loadSound("a#24.wav");
 
 	playCutscene(0, 18);
-	playGlobalSound("a#16.wav", -1, false, false, 0);
+	playGlobalSound("a#16.wav", VOL_NORMAL, false, false, 0);
 	playCutscene(19, 642);
 	playSound("a#24.wav");
 	playCutscene(643, 750);
diff --git a/engines/titanic/game/end_credit_text.cpp b/engines/titanic/game/end_credit_text.cpp
index 4eee13d3fb..9af13133d6 100644
--- a/engines/titanic/game/end_credit_text.cpp
+++ b/engines/titanic/game/end_credit_text.cpp
@@ -43,7 +43,7 @@ void CEndCreditText::load(SimpleFile *file) {
 }
 
 bool CEndCreditText::ActMsg(CActMsg *msg) {
-	playGlobalSound("z#41.wav", -1, false, false, 0);
+	playGlobalSound("z#41.wav", VOL_NORMAL, false, false, 0);
 	createCredits();
 	_flag = true;
 	return true;
@@ -63,7 +63,7 @@ bool CEndCreditText::FrameMsg(CFrameMsg *msg) {
 }
 
 bool CEndCreditText::TimerMsg(CTimerMsg *msg) {
-	setGlobalSoundVolume(-4, 2, -1);
+	setGlobalSoundVolume(VOL_MUTE, 2, -1);
 	sleep(1000);
 	quitGame();
 	return true;
diff --git a/engines/titanic/game/end_credits.cpp b/engines/titanic/game/end_credits.cpp
index f613e5a008..77abfb006e 100644
--- a/engines/titanic/game/end_credits.cpp
+++ b/engines/titanic/game/end_credits.cpp
@@ -48,7 +48,7 @@ bool CEndCredits::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 		_flag = false;
 	} else {
 		loadSound("z#41.wav");
-		playGlobalSound("z#41.wav", -1, false, false, 0);
+		playGlobalSound("z#41.wav", VOL_NORMAL, false, false, 0);
 		_flag = true;
 	}
 
diff --git a/engines/titanic/game/end_explode_ship.cpp b/engines/titanic/game/end_explode_ship.cpp
index 05220b9657..633e47e668 100644
--- a/engines/titanic/game/end_explode_ship.cpp
+++ b/engines/titanic/game/end_explode_ship.cpp
@@ -55,7 +55,7 @@ bool CEndExplodeShip::ActMsg(CActMsg *msg) {
 	} else if (msg->_action == "TakeOff") {
 		loadSound("a#31.wav");
 		loadSound("a#14.wav");
-		playGlobalSound("a#13.wav", -1, true, true, 0);
+		playGlobalSound("a#13.wav", VOL_NORMAL, true, true, 0);
 		addTimer(1, 10212, 0);
 	}
 
@@ -71,7 +71,7 @@ bool CEndExplodeShip::TimerMsg(CTimerMsg *msg) {
 	}
 
 	if (msg->_actionVal == 3) {
-		setGlobalSoundVolume(-4, 2, -1);
+		setGlobalSoundVolume(VOL_MUTE, 2, -1);
 		CActMsg actMsg(_isExploding ? "ExplodeCredits" : "Credits");
 		actMsg.execute("EndGameCredits");
 	}
diff --git a/engines/titanic/game/end_sequence_control.cpp b/engines/titanic/game/end_sequence_control.cpp
index 55d3b2139e..52151f353e 100644
--- a/engines/titanic/game/end_sequence_control.cpp
+++ b/engines/titanic/game/end_sequence_control.cpp
@@ -61,7 +61,7 @@ bool CEndSequenceControl::TimerMsg(CTimerMsg *msg) {
 }
 
 bool CEndSequenceControl::MovieEndMsg(CMovieEndMsg *msg) {
-	setGlobalSoundVolume(-4, 2, -1);
+	setGlobalSoundVolume(VOL_MUTE, 2, -1);
 	changeView("TheEnd.Node 3.N");
 	addTimer(2, 1000, 0);
 	return true;
@@ -71,7 +71,7 @@ bool CEndSequenceControl::EnterRoomMsg(CEnterRoomMsg *msg) {
 	petHide();
 	disableMouse();
 	addTimer(1, 1000, 0);
-	playGlobalSound("a#15.wav", -1, true, true, 0, Audio::Mixer::kSpeechSoundType);
+	playGlobalSound("a#15.wav", VOL_NORMAL, true, true, 0, Audio::Mixer::kSpeechSoundType);
 	return true;
 }
 
diff --git a/engines/titanic/game/phonograph.cpp b/engines/titanic/game/phonograph.cpp
index b86fa0b6e0..71fd42861a 100644
--- a/engines/titanic/game/phonograph.cpp
+++ b/engines/titanic/game/phonograph.cpp
@@ -84,7 +84,7 @@ bool CPhonograph::PhonographPlayMsg(CPhonographPlayMsg *msg) {
 		msg->_value = 1;
 	} else {
 		stopGlobalSound(false, -1);
-		playGlobalSound(cylinderMsg._name, -2, true, true, 0);
+		playGlobalSound(cylinderMsg._name, VOL_QUIET, true, true, 0);
 		_isPlaying = true;
 		msg->_value = 1;
 	}
diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp
index 8dfc55905a..6d081f280c 100644
--- a/engines/titanic/game/transport/lift.cpp
+++ b/engines/titanic/game/transport/lift.cpp
@@ -189,23 +189,23 @@ bool CLift::StatusChangeMsg(CStatusChangeMsg *msg) {
 bool CLift::MovieEndMsg(CMovieEndMsg *msg) {
 	switch (msg->_endFrame) {
 	case 108:
-		setGlobalSoundVolume(-4, 1, 2);
-		setGlobalSoundVolume(-2, 1, 1);
+		setGlobalSoundVolume(VOL_MUTE, 1, 2);
+		setGlobalSoundVolume(VOL_QUIET, 1, 1);
 		break;
 
 	case 190:
-		setGlobalSoundVolume(-4, 1, 1);
-		setGlobalSoundVolume(-2, 1, 2);
+		setGlobalSoundVolume(VOL_MUTE, 1, 1);
+		setGlobalSoundVolume(VOL_QUIET, 1, 2);
 		break;
 
 	case 407:
-		setGlobalSoundVolume(-4, 1, 0);
-		setGlobalSoundVolume(-2, 1, 1);
+		setGlobalSoundVolume(VOL_MUTE, 1, 0);
+		setGlobalSoundVolume(VOL_QUIET, 1, 1);
 		break;
 
 	case 489:
-		setGlobalSoundVolume(-4, 1, 1);
-		setGlobalSoundVolume(-2, 1, 0);
+		setGlobalSoundVolume(VOL_MUTE, 1, 1);
+		setGlobalSoundVolume(VOL_QUIET, 1, 0);
 		break;
 
 	default: {
@@ -251,17 +251,17 @@ bool CLift::EnterRoomMsg(CEnterRoomMsg *msg) {
 		}
 
 		if (floorNum < 20) {
-			playGlobalSound("z#520.wav", -2, true, true, 0);
-			playGlobalSound("z#519.wav", -4, false, true, 1);
-			playGlobalSound("z#518.wav", -4, false, true, 2);
+			playGlobalSound("z#520.wav", VOL_QUIET, true, true, 0);
+			playGlobalSound("z#519.wav", VOL_MUTE, false, true, 1);
+			playGlobalSound("z#518.wav", VOL_MUTE, false, true, 2);
 		} else if (floorNum < 28) {
-			playGlobalSound("z#520.wav", -4, false, true, 0);
-			playGlobalSound("z#519.wav", -2, true, true, 1);
-			playGlobalSound("z#518.wav", -4, false, true, 2);
+			playGlobalSound("z#520.wav", VOL_MUTE, false, true, 0);
+			playGlobalSound("z#519.wav", VOL_QUIET, true, true, 1);
+			playGlobalSound("z#518.wav", VOL_MUTE, false, true, 2);
 		} else {
-			playGlobalSound("z#520.wav", -4, false, true, 0);
-			playGlobalSound("z#519.wav", -4, false, true, 1);
-			playGlobalSound("z#518.wav", -2, true, true, 2);
+			playGlobalSound("z#520.wav", VOL_MUTE, false, true, 0);
+			playGlobalSound("z#519.wav", VOL_MUTE, false, true, 1);
+			playGlobalSound("z#518.wav", VOL_QUIET, true, true, 2);
 		}
 	}
 
diff --git a/engines/titanic/game/transport/pellerator.cpp b/engines/titanic/game/transport/pellerator.cpp
index 0228f9bc8b..7771314d50 100644
--- a/engines/titanic/game/transport/pellerator.cpp
+++ b/engines/titanic/game/transport/pellerator.cpp
@@ -62,7 +62,7 @@ void CPellerator::load(SimpleFile *file) {
 
 bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 	setVisible(true);
-	playGlobalSound("z#74.wav", -2, true, true, 0);
+	playGlobalSound("z#74.wav", VOL_QUIET, true, true, 0);
 	int classNum = getPassengerClass();
 	int newDest = msg->_newStatus;