TITANIC: Renamed GlobalSound methods to AmbientSound

8 files changed, 35 insertions, 35 deletions

diff --git a/engines/titanic/game/credits.cpp b/engines/titanic/game/credits.cpp
index ddb44f127c..016245dbb0 100644
--- a/engines/titanic/game/credits.cpp
+++ b/engines/titanic/game/credits.cpp
@@ -57,13 +57,13 @@ bool CCredits::SignalObject(CSignalObject *msg) {
 }
 
 bool CCredits::TimerMsg(CTimerMsg *msg) {
-	stopGlobalSound(true, -1);
+	stopAmbientSound(true, -1);
 	setVisible(true);
 	loadSound(TRANSLATE("a#16.wav", "a#11.wav"));
 	loadSound(TRANSLATE("a#24.wav", "a#19.wav"));
 
 	if (playCutscene(0, 18)) {
-		playGlobalSound(TRANSLATE("a#16.wav", "a#11.wav"), VOL_NORMAL, false, false, 0);
+		playAmbientSound(TRANSLATE("a#16.wav", "a#11.wav"), VOL_NORMAL, false, false, 0);
 		if (playCutscene(19, 642)) {
 			playSound(TRANSLATE("a#24.wav", "a#19.wav"));
 			playCutscene(643, 750);
@@ -77,7 +77,7 @@ bool CCredits::TimerMsg(CTimerMsg *msg) {
 	setVisible(false);
 	petShow();
 	enableMouse();
-	stopGlobalSound(true, -1);
+	stopAmbientSound(true, -1);
 	return true;
 }
 
diff --git a/engines/titanic/game/end_credit_text.cpp b/engines/titanic/game/end_credit_text.cpp
index 8809799a27..2392f9d321 100644
--- a/engines/titanic/game/end_credit_text.cpp
+++ b/engines/titanic/game/end_credit_text.cpp
@@ -44,7 +44,7 @@ void CEndCreditText::load(SimpleFile *file) {
 }
 
 bool CEndCreditText::ActMsg(CActMsg *msg) {
-	playGlobalSound(TRANSLATE("z#41.wav", "z#573.wav"), VOL_NORMAL, false, false, 0);
+	playAmbientSound(TRANSLATE("z#41.wav", "z#573.wav"), VOL_NORMAL, false, false, 0);
 	createCredits();
 	_flag = true;
 	return true;
@@ -64,7 +64,7 @@ bool CEndCreditText::FrameMsg(CFrameMsg *msg) {
 }
 
 bool CEndCreditText::TimerMsg(CTimerMsg *msg) {
-	setGlobalSoundVolume(VOL_MUTE, 2, -1);
+	setAmbientSoundVolume(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 4ea54a3b76..84ac020a2c 100644
--- a/engines/titanic/game/end_credits.cpp
+++ b/engines/titanic/game/end_credits.cpp
@@ -45,11 +45,11 @@ void CEndCredits::load(SimpleFile *file) {
 bool CEndCredits::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 	if (_flag) {
 		deinit();
-		stopGlobalSound(true, -1);
+		stopAmbientSound(true, -1);
 		_flag = false;
 	} else {
 		loadSound(TRANSLATE("z#41.wav", "z#573.wav"));
-		playGlobalSound(TRANSLATE("z#41.wav", "z#573.wav"), VOL_NORMAL, false, false, 0);
+		playAmbientSound(TRANSLATE("z#41.wav", "z#573.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 5f90604fd7..5ad046b5ad 100644
--- a/engines/titanic/game/end_explode_ship.cpp
+++ b/engines/titanic/game/end_explode_ship.cpp
@@ -56,7 +56,7 @@ bool CEndExplodeShip::ActMsg(CActMsg *msg) {
 	} else if (msg->_action == "TakeOff") {
 		loadSound(TRANSLATE("a#31.wav", "a#26.wav"));
 		loadSound(TRANSLATE("a#14.wav", "a#7.wav"));
-		playGlobalSound(TRANSLATE("a#13.wav", "a#6.wav"), VOL_NORMAL, true, true, 0);
+		playAmbientSound(TRANSLATE("a#13.wav", "a#6.wav"), VOL_NORMAL, true, true, 0);
 		addTimer(1, 10212, 0);
 	}
 
@@ -72,7 +72,7 @@ bool CEndExplodeShip::TimerMsg(CTimerMsg *msg) {
 	}
 
 	if (msg->_actionVal == 3) {
-		setGlobalSoundVolume(VOL_MUTE, 2, -1);
+		setAmbientSoundVolume(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 e8bc04aa85..a7abf01da0 100644
--- a/engines/titanic/game/end_sequence_control.cpp
+++ b/engines/titanic/game/end_sequence_control.cpp
@@ -62,7 +62,7 @@ bool CEndSequenceControl::TimerMsg(CTimerMsg *msg) {
 }
 
 bool CEndSequenceControl::MovieEndMsg(CMovieEndMsg *msg) {
-	setGlobalSoundVolume(VOL_MUTE, 2, -1);
+	setAmbientSoundVolume(VOL_MUTE, 2, -1);
 	changeView("TheEnd.Node 3.N");
 	addTimer(2, 1000, 0);
 	return true;
@@ -72,7 +72,7 @@ bool CEndSequenceControl::EnterRoomMsg(CEnterRoomMsg *msg) {
 	petHide();
 	disableMouse();
 	addTimer(1, 1000, 0);
-	playGlobalSound(TRANSLATE("a#15.wav", "a#8.wav"), VOL_NORMAL, true, true, 0, Audio::Mixer::kSpeechSoundType);
+	playAmbientSound(TRANSLATE("a#15.wav", "a#8.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 71fd42861a..71b3df768b 100644
--- a/engines/titanic/game/phonograph.cpp
+++ b/engines/titanic/game/phonograph.cpp
@@ -83,8 +83,8 @@ bool CPhonograph::PhonographPlayMsg(CPhonographPlayMsg *msg) {
 		_isPlaying = true;
 		msg->_value = 1;
 	} else {
-		stopGlobalSound(false, -1);
-		playGlobalSound(cylinderMsg._name, VOL_QUIET, true, true, 0);
+		stopAmbientSound(false, -1);
+		playAmbientSound(cylinderMsg._name, VOL_QUIET, true, true, 0);
 		_isPlaying = true;
 		msg->_value = 1;
 	}
@@ -107,7 +107,7 @@ bool CPhonograph::PhonographStopMsg(CPhonographStopMsg *msg) {
 				CStopMusicMsg stopMsg;
 				stopMsg.execute(this);
 			} else {
-				stopGlobalSound(msg->_leavingRoom, -1);
+				stopAmbientSound(msg->_leavingRoom, -1);
 			}
 			msg->_cylinderPresent = true;
 		}
diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp
index 568e5becaf..95a4a8ebb9 100644
--- a/engines/titanic/game/transport/lift.cpp
+++ b/engines/titanic/game/transport/lift.cpp
@@ -190,23 +190,23 @@ bool CLift::StatusChangeMsg(CStatusChangeMsg *msg) {
 bool CLift::MovieEndMsg(CMovieEndMsg *msg) {
 	switch (msg->_endFrame) {
 	case 108:
-		setGlobalSoundVolume(VOL_MUTE, 1, 0);
-		setGlobalSoundVolume(VOL_QUIET, 1, 1);
+		setAmbientSoundVolume(VOL_MUTE, 1, 0);
+		setAmbientSoundVolume(VOL_QUIET, 1, 1);
 		break;
 
 	case 190:
-		setGlobalSoundVolume(VOL_MUTE, 1, 1);
-		setGlobalSoundVolume(VOL_QUIET, 1, 2);
+		setAmbientSoundVolume(VOL_MUTE, 1, 1);
+		setAmbientSoundVolume(VOL_QUIET, 1, 2);
 		break;
 
 	case 407:
-		setGlobalSoundVolume(VOL_MUTE, 1, 2);
-		setGlobalSoundVolume(VOL_QUIET, 1, 1);
+		setAmbientSoundVolume(VOL_MUTE, 1, 2);
+		setAmbientSoundVolume(VOL_QUIET, 1, 1);
 		break;
 
 	case 489:
-		setGlobalSoundVolume(VOL_MUTE, 1, 1);
-		setGlobalSoundVolume(VOL_QUIET, 1, 0);
+		setAmbientSoundVolume(VOL_MUTE, 1, 1);
+		setAmbientSoundVolume(VOL_QUIET, 1, 0);
 		break;
 
 	default: {
@@ -252,17 +252,17 @@ bool CLift::EnterRoomMsg(CEnterRoomMsg *msg) {
 		}
 
 		if (floorNum < 20) {
-			playGlobalSound(TRANSLATE("z#520.wav", "z#259.wav"), VOL_QUIET, true, true, 0);
-			playGlobalSound(TRANSLATE("z#519.wav", "z#258.wav"), VOL_MUTE, false, true, 1);
-			playGlobalSound(TRANSLATE("z#518.wav", "z#257.wav"), VOL_MUTE, false, true, 2);
+			playAmbientSound(TRANSLATE("z#520.wav", "z#259.wav"), VOL_QUIET, true, true, 0);
+			playAmbientSound(TRANSLATE("z#519.wav", "z#258.wav"), VOL_MUTE, false, true, 1);
+			playAmbientSound(TRANSLATE("z#518.wav", "z#257.wav"), VOL_MUTE, false, true, 2);
 		} else if (floorNum < 28) {
-			playGlobalSound(TRANSLATE("z#520.wav", "z#259.wav"), VOL_MUTE, false, true, 0);
-			playGlobalSound(TRANSLATE("z#519.wav", "z#258.wav"), VOL_QUIET, true, true, 1);
-			playGlobalSound(TRANSLATE("z#518.wav", "z#257.wav"), VOL_MUTE, false, true, 2);
+			playAmbientSound(TRANSLATE("z#520.wav", "z#259.wav"), VOL_MUTE, false, true, 0);
+			playAmbientSound(TRANSLATE("z#519.wav", "z#258.wav"), VOL_QUIET, true, true, 1);
+			playAmbientSound(TRANSLATE("z#518.wav", "z#257.wav"), VOL_MUTE, false, true, 2);
 		} else {
-			playGlobalSound(TRANSLATE("z#520.wav", "z#259.wav"), VOL_MUTE, false, true, 0);
-			playGlobalSound(TRANSLATE("z#519.wav", "z#258.wav"), VOL_MUTE, false, true, 1);
-			playGlobalSound(TRANSLATE("z#518.wav", "z#257.wav"), VOL_QUIET, true, true, 2);
+			playAmbientSound(TRANSLATE("z#520.wav", "z#259.wav"), VOL_MUTE, false, true, 0);
+			playAmbientSound(TRANSLATE("z#519.wav", "z#258.wav"), VOL_MUTE, false, true, 1);
+			playAmbientSound(TRANSLATE("z#518.wav", "z#257.wav"), VOL_QUIET, true, true, 2);
 		}
 	}
 
@@ -270,7 +270,7 @@ bool CLift::EnterRoomMsg(CEnterRoomMsg *msg) {
 }
 
 bool CLift::LeaveRoomMsg(CLeaveRoomMsg *msg) {
-	stopGlobalSound(true, -1);
+	stopAmbientSound(true, -1);
 
 	CPetControl *pet = getPetControl();
 	if (pet->getRoomsElevatorNum() == 4 && _hasHead && !_hasCorrectHead) {
diff --git a/engines/titanic/game/transport/pellerator.cpp b/engines/titanic/game/transport/pellerator.cpp
index 64d0fadfe5..55f701f0f0 100644
--- a/engines/titanic/game/transport/pellerator.cpp
+++ b/engines/titanic/game/transport/pellerator.cpp
@@ -77,7 +77,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 	} else if (classNum == 3 || (msg->_newStatus > 4 && classNum != 1)) {
 		petDisplayMessage(1, CLASS_NOT_ALLOWED_AT_DEST);
 	} else if (newDest > _destination) {
-		playGlobalSound(TRANSLATE("z#74.wav", "z#605.wav"), VOL_QUIET, true, true, 0);
+		playAmbientSound(TRANSLATE("z#74.wav", "z#605.wav"), VOL_QUIET, true, true, 0);
 
 		CString name = getName();
 		changeView(name == "PelleratorObject2" ?
@@ -180,7 +180,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 		playMovie(264, 264, MOVIE_NOTIFY_OBJECT);
 		_destination = newDest;
 	} else if (newDest < _destination) {
-		playGlobalSound(TRANSLATE("z#74.wav", "z#605.wav"), VOL_QUIET, true, true, 0);
+		playAmbientSound(TRANSLATE("z#74.wav", "z#605.wav"), VOL_QUIET, true, true, 0);
 
 		CString name = getName();
 		changeView(name == "PelleratorObject2" ?
@@ -341,7 +341,7 @@ bool CPellerator::EnterRoomMsg(CEnterRoomMsg *msg) {
 
 bool CPellerator::MovieEndMsg(CMovieEndMsg *msg) {
 	setVisible(false);
-	stopGlobalSound(true, -1);
+	stopAmbientSound(true, -1);
 
 	switch (_destination) {
 	case 0: