TITANIC: Renamed GlobalSound methods to AmbientSound

2 files changed, 18 insertions, 18 deletions

diff --git a/engines/titanic/sound/auto_music_player_base.cpp b/engines/titanic/sound/auto_music_player_base.cpp
index 968344a5b5..3737782c44 100644
--- a/engines/titanic/sound/auto_music_player_base.cpp
+++ b/engines/titanic/sound/auto_music_player_base.cpp
@@ -70,7 +70,7 @@ bool CAutoMusicPlayerBase::TimerMsg(CTimerMsg *msg) {
 
 bool CAutoMusicPlayerBase::LoadSuccessMsg(CLoadSuccessMsg *msg) {
 	if (_isEnabled)
-		playGlobalSound(_filename, _volumeMode, _initialMute, true, 0,
+		playAmbientSound(_filename, _volumeMode, _initialMute, true, 0,
 			Audio::Mixer::kMusicSoundType);
 
 	return true;
@@ -79,22 +79,22 @@ bool CAutoMusicPlayerBase::LoadSuccessMsg(CLoadSuccessMsg *msg) {
 bool CAutoMusicPlayerBase::ChangeMusicMsg(CChangeMusicMsg *msg) {
 	if (_isEnabled && msg->_action == MUSIC_STOP) {
 		_isEnabled = false;
-		stopGlobalSound(_transition, -1);
+		stopAmbientSound(_transition, -1);
 	}
 
 	if (!msg->_filename.empty()) {
 		_filename = msg->_filename;
 
 		if (_isEnabled) {
-			stopGlobalSound(_transition, -1);
-			playGlobalSound(_filename, _volumeMode, _initialMute, true, 0,
+			stopAmbientSound(_transition, -1);
+			playAmbientSound(_filename, _volumeMode, _initialMute, true, 0,
 				Audio::Mixer::kMusicSoundType);
 		}
 	}
 
 	if (!_isEnabled && msg->_action == MUSIC_START) {
 		_isEnabled = true;
-		playGlobalSound(_filename, _volumeMode, _initialMute, true, 0,
+		playAmbientSound(_filename, _volumeMode, _initialMute, true, 0,
 			Audio::Mixer::kMusicSoundType);
 	}
 
diff --git a/engines/titanic/sound/seasonal_music_player.cpp b/engines/titanic/sound/seasonal_music_player.cpp
index ff5e4809f8..92603773ea 100644
--- a/engines/titanic/sound/seasonal_music_player.cpp
+++ b/engines/titanic/sound/seasonal_music_player.cpp
@@ -99,22 +99,22 @@ bool CSeasonalMusicPlayer::ArboretumGateMsg(CArboretumGateMsg *msg) {
 bool CSeasonalMusicPlayer::ChangeMusicMsg(CChangeMusicMsg *msg) {
 	if (_isEnabled && msg->_action == MUSIC_STOP) {
 		_isEnabled = false;
-		stopGlobalSound(_transition, -1);
+		stopAmbientSound(_transition, -1);
 	}
 
 	if (!msg->_filename.empty()) {
 		if (_isSummer) {
-			setGlobalSoundVolume(VOL_MUTE, 2, 0);
-			setGlobalSoundVolume(VOL_QUIET, 2, 1);
+			setAmbientSoundVolume(VOL_MUTE, 2, 0);
+			setAmbientSoundVolume(VOL_QUIET, 2, 1);
 		} else if (_isAutumn) {
-			setGlobalSoundVolume(VOL_MUTE, 2, 1);
-			setGlobalSoundVolume(VOL_QUIET, 2, 2);
+			setAmbientSoundVolume(VOL_MUTE, 2, 1);
+			setAmbientSoundVolume(VOL_QUIET, 2, 2);
 		} else if (_isWinter) {
-			setGlobalSoundVolume(VOL_MUTE, 2, 2);
-			setGlobalSoundVolume(VOL_QUIET, 2, 3);
+			setAmbientSoundVolume(VOL_MUTE, 2, 2);
+			setAmbientSoundVolume(VOL_QUIET, 2, 3);
 		} else if (_isSpring) {
-			setGlobalSoundVolume(VOL_MUTE, 2, 3);
-			setGlobalSoundVolume(VOL_QUIET, 2, 0);
+			setAmbientSoundVolume(VOL_MUTE, 2, 3);
+			setAmbientSoundVolume(VOL_QUIET, 2, 0);
 		}
 	}
 
@@ -124,10 +124,10 @@ bool CSeasonalMusicPlayer::ChangeMusicMsg(CChangeMusicMsg *msg) {
 		loadSound(TRANSLATE("c#63.wav", "c#46.wav"));
 		loadSound(TRANSLATE("c#65.wav", "c#48.wav"));
 		loadSound(TRANSLATE("c#62.wav", "c#47.wav"));
-		playGlobalSound(TRANSLATE("c#64.wav", "c#47.wav"), _springMode, _isSpring, true, 0);
-		playGlobalSound(TRANSLATE("c#63.wav", "c#46.wav"), _summerMode, _isSummer, true, 1);
-		playGlobalSound(TRANSLATE("c#65.wav", "c#48.wav"), _autumnMode, _isAutumn, true, 2);
-		playGlobalSound(TRANSLATE("c#62.wav", "c#47.wav"), _winterMode, _isWinter, true, 3);
+		playAmbientSound(TRANSLATE("c#64.wav", "c#47.wav"), _springMode, _isSpring, true, 0);
+		playAmbientSound(TRANSLATE("c#63.wav", "c#46.wav"), _summerMode, _isSummer, true, 1);
+		playAmbientSound(TRANSLATE("c#65.wav", "c#48.wav"), _autumnMode, _isAutumn, true, 2);
+		playAmbientSound(TRANSLATE("c#62.wav", "c#47.wav"), _winterMode, _isWinter, true, 3);
 	}
 
 	return true;