From 850dcdbdf8252b4f5dbc6812c0108d58f101534e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 16 Jul 2017 16:18:16 -0400
Subject: TITANIC: Add a VolumeMode enum

---
 engines/titanic/game/transport/lift.cpp       | 34 +++++++++++++--------------
 engines/titanic/game/transport/pellerator.cpp |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'engines/titanic/game/transport')

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;
 
-- 
cgit v1.2.3