diff options
| author | Paul Gilbert | 2017-10-13 18:03:30 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-10-13 18:03:30 -0400 |
| commit | c339e3261d84526e721d60d656cefeb0a27a9af9 (patch) | |
| tree | 58d13333b6093814b5800e56111f2bba601ea058 /engines/titanic/game/transport | |
| parent | 1d8ccbe1eae59811c90d5a6a22870e97272e178d (diff) | |
| download | scummvm-rg350-c339e3261d84526e721d60d656cefeb0a27a9af9.tar.gz scummvm-rg350-c339e3261d84526e721d60d656cefeb0a27a9af9.tar.bz2 scummvm-rg350-c339e3261d84526e721d60d656cefeb0a27a9af9.zip | |
TITANIC: Renamed GlobalSound methods to AmbientSound
Diffstat (limited to 'engines/titanic/game/transport')
| -rw-r--r-- | engines/titanic/game/transport/lift.cpp | 36 | ||||
| -rw-r--r-- | engines/titanic/game/transport/pellerator.cpp | 6 |
2 files changed, 21 insertions, 21 deletions
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: |