From 7a184f0e7fa0af7eca0518af6b46be09fcf25bdc Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 20 Sep 2017 06:28:34 -0400 Subject: TITANIC: DE: Add translations for loadSound calls --- engines/titanic/game/end_credits.cpp | 5 +++-- engines/titanic/game/end_explode_ship.cpp | 13 +++++++------ engines/titanic/game/sweet_bowl.cpp | 9 ++++++--- engines/titanic/game/transport/lift.cpp | 25 +++++++++++++------------ engines/titanic/sound/seasonal_music_player.cpp | 17 +++++++++-------- 5 files changed, 38 insertions(+), 31 deletions(-) (limited to 'engines/titanic') diff --git a/engines/titanic/game/end_credits.cpp b/engines/titanic/game/end_credits.cpp index 77abfb006e..4ea54a3b76 100644 --- a/engines/titanic/game/end_credits.cpp +++ b/engines/titanic/game/end_credits.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/end_credits.h" +#include "titanic/translation.h" namespace Titanic { @@ -47,8 +48,8 @@ bool CEndCredits::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { stopGlobalSound(true, -1); _flag = false; } else { - loadSound("z#41.wav"); - playGlobalSound("z#41.wav", VOL_NORMAL, false, false, 0); + loadSound(TRANSLATE("z#41.wav", "z#573.wav")); + playGlobalSound(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 2de9192319..5f90604fd7 100644 --- a/engines/titanic/game/end_explode_ship.cpp +++ b/engines/titanic/game/end_explode_ship.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/end_explode_ship.h" +#include "titanic/translation.h" namespace Titanic { @@ -53,9 +54,9 @@ bool CEndExplodeShip::ActMsg(CActMsg *msg) { } else if (msg->_action == "Disarm Bomb") { _isExploding = false; } else if (msg->_action == "TakeOff") { - loadSound("a#31.wav"); - loadSound("a#14.wav"); - playGlobalSound("a#13.wav", VOL_NORMAL, true, true, 0); + 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); addTimer(1, 10212, 0); } @@ -86,7 +87,7 @@ bool CEndExplodeShip::TimerMsg(CTimerMsg *msg) { bool CEndExplodeShip::MovieEndMsg(CMovieEndMsg *msg) { if (msg->_endFrame == 550) { - playSound("z#399.wav"); + playSound(TRANSLATE("z#399.wav", "a#10.wav")); startAnimTimer("Boom", 4200, 0); } else { addTimer(3, 8000, 0); @@ -97,9 +98,9 @@ bool CEndExplodeShip::MovieEndMsg(CMovieEndMsg *msg) { bool CEndExplodeShip::MovieFrameMsg(CMovieFrameMsg *msg) { if (msg->_frameNumber == 58) - playSound("a#31.wav", 70); + playSound(TRANSLATE("a#31.wav", "a#26.wav"), 70); else if (msg->_frameNumber == 551) - playSound("a#14.wav"); + playSound(TRANSLATE("a#14.wav", "a#7.wav")); return true; } diff --git a/engines/titanic/game/sweet_bowl.cpp b/engines/titanic/game/sweet_bowl.cpp index a1d0dc2b01..81d93939d5 100644 --- a/engines/titanic/game/sweet_bowl.cpp +++ b/engines/titanic/game/sweet_bowl.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/sweet_bowl.h" +#include "titanic/translation.h" namespace Titanic { @@ -47,8 +48,8 @@ bool CSweetBowl::MovieEndMsg(CMovieEndMsg *msg) { bool CSweetBowl::EnterViewMsg(CEnterViewMsg *msg) { setVisible(false); - loadSound("b#43.wav"); - loadSound("b#42.wav"); + loadSound(TRANSLATE("b#43.wav", "b#26.wav")); + loadSound(TRANSLATE("b#42.wav", "b#25.wav")); return true; } @@ -56,7 +57,9 @@ bool CSweetBowl::ActMsg(CActMsg *msg) { if (msg->_action == "Jiggle") { setVisible(true); playMovie(MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); - playSound(getRandomNumber(1) == 1 ? "b#42.wav" : "b#43.wav"); + playSound(getRandomNumber(1) == 1 ? + TRANSLATE("b#42.wav", "b#25.wav") : + TRANSLATE("b#43.wav", "b#26.wav")); } petDisplayMessage(isEquals("BowlNutsRustler") ? diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp index 614018f447..568e5becaf 100644 --- a/engines/titanic/game/transport/lift.cpp +++ b/engines/titanic/game/transport/lift.cpp @@ -24,6 +24,7 @@ #include "titanic/debugger.h" #include "titanic/moves/multi_move.h" #include "titanic/pet_control/pet_control.h" +#include "titanic/translation.h" namespace Titanic { @@ -241,9 +242,9 @@ bool CLift::EnterRoomMsg(CEnterRoomMsg *msg) { CPetControl *pet = getPetControl(); int floorNum = pet->getRoomsFloorNum(); int elevNum = pet->getRoomsElevatorNum(); - loadSound("z#520.wav"); - loadSound("z#519.wav"); - loadSound("z#518.wav"); + loadSound(TRANSLATE("z#520.wav", "z#259.wav")); + loadSound(TRANSLATE("z#519.wav", "z#258.wav")); + loadSound(TRANSLATE("z#518.wav", "z#257.wav")); if (elevNum == 4 && _hasHead && !_hasCorrectHead) { CVisibleMsg visibleMsg; @@ -251,17 +252,17 @@ bool CLift::EnterRoomMsg(CEnterRoomMsg *msg) { } if (floorNum < 20) { - 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); + 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); } else if (floorNum < 28) { - 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); + 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); } else { - 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); + 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); } } diff --git a/engines/titanic/sound/seasonal_music_player.cpp b/engines/titanic/sound/seasonal_music_player.cpp index 40bf7096f2..637a0020ba 100644 --- a/engines/titanic/sound/seasonal_music_player.cpp +++ b/engines/titanic/sound/seasonal_music_player.cpp @@ -21,6 +21,7 @@ */ #include "titanic/sound/seasonal_music_player.h" +#include "titanic/translation.h" namespace Titanic { @@ -119,14 +120,14 @@ bool CSeasonalMusicPlayer::ChangeMusicMsg(CChangeMusicMsg *msg) { if (!_isRepeated && msg->_flags == 2) { _isRepeated = true; - loadSound("c#64.wav"); - loadSound("c#63.wav"); - loadSound("c#65.wav"); - loadSound("c#62.wav"); - playGlobalSound("c#64.wav", _springMode, _isSpring, true, 0); - playGlobalSound("c#63.wav", _summerMode, _isSummer, true, 1); - playGlobalSound("c#65.wav", _autumnMode, _isAutumn, true, 2); - playGlobalSound("c#62.wav", _winterMode, _isWinter, true, 3); + loadSound(TRANSLATE("c#64.wav", "c#47.wav")); + 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); } return true; -- cgit v1.2.3