From 9eb3e30fb2cda2315cc8e16959fab4215d230c8c Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 21 Sep 2017 20:06:35 -0400 Subject: TITANIC: DE: More sound translations --- engines/titanic/game/sauce_dispensor.cpp | 5 +++-- engines/titanic/game/search_point.cpp | 3 ++- engines/titanic/game/seasonal_adjustment.cpp | 3 ++- engines/titanic/game/sgt/sgt_state_room.cpp | 3 ++- engines/titanic/game/sgt/toilet.cpp | 5 +++-- engines/titanic/game/sgt/washstand.cpp | 5 +++-- engines/titanic/game/speech_dispensor.cpp | 5 +++-- engines/titanic/game/sub_glass.cpp | 5 +++-- engines/titanic/game/television.cpp | 5 +++-- engines/titanic/game/throw_tv_down_well.cpp | 9 +++++---- engines/titanic/game/up_lighter.cpp | 3 ++- engines/titanic/game/useless_lever.cpp | 5 +++-- engines/titanic/npcs/succubus.cpp | 15 ++++++++------- engines/titanic/npcs/titania.cpp | 5 +++-- engines/titanic/sound/titania_speech.cpp | 21 +++++++++++---------- 15 files changed, 56 insertions(+), 41 deletions(-) diff --git a/engines/titanic/game/sauce_dispensor.cpp b/engines/titanic/game/sauce_dispensor.cpp index 7b395e5b11..993a577fd7 100644 --- a/engines/titanic/game/sauce_dispensor.cpp +++ b/engines/titanic/game/sauce_dispensor.cpp @@ -23,6 +23,7 @@ #include "titanic/game/sauce_dispensor.h" #include "titanic/carry/chicken.h" #include "titanic/carry/glass.h" +#include "titanic/translation.h" namespace Titanic { @@ -73,7 +74,7 @@ bool CSauceDispensor::Use(CUse *msg) { CChicken *chicken = static_cast(msg->_item); _field104 = true; if (_starlingsDead) { - playSound("b#15.wav", 50); + playSound(TRANSLATE("b#15.wav", "z#562.wav"), 50); if (chicken->_condiment != "None") { petDisplayMessage(1, FOODSTUFF_ALREADY_GARNISHED); @@ -96,7 +97,7 @@ bool CSauceDispensor::Use(CUse *msg) { CMovieEndMsg endMsg(0, 0); endMsg.execute(this); - playSound("z#120.wav"); + playSound(TRANSLATE("z#120.wav", "z#651.wav")); petDisplayMessage(1, DISPENSOR_IS_EMPTY); } else if (msg->_item->isEquals("BeerGlass")) { diff --git a/engines/titanic/game/search_point.cpp b/engines/titanic/game/search_point.cpp index bbe923267a..da5c4e5d55 100644 --- a/engines/titanic/game/search_point.cpp +++ b/engines/titanic/game/search_point.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/search_point.h" +#include "titanic/translation.h" namespace Titanic { @@ -47,7 +48,7 @@ bool CSearchPoint::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { child->petAddToInventory(); CVisibleMsg visibleMsg(true); visibleMsg.execute(child->getName()); - playSound("z#47.wav"); + playSound(TRANSLATE("z#47.wav", "z#578.wav")); } if (--_value == 0) diff --git a/engines/titanic/game/seasonal_adjustment.cpp b/engines/titanic/game/seasonal_adjustment.cpp index 7a729c9d90..f9f834eed4 100644 --- a/engines/titanic/game/seasonal_adjustment.cpp +++ b/engines/titanic/game/seasonal_adjustment.cpp @@ -22,6 +22,7 @@ #include "titanic/game/seasonal_adjustment.h" #include "titanic/core/project_item.h" +#include "titanic/translation.h" namespace Titanic { @@ -79,7 +80,7 @@ bool CSeasonalAdjustment::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { } bool CSeasonalAdjustment::MouseButtonUpMsg(CMouseButtonUpMsg *msg) { - playSound("z#42.wav"); + playSound(TRANSLATE("z#42.wav", "z#743.wav")); if (!_enabled) { petDisplayMessage(1, SEASONAL_SWITCH_NOT_WORKING); } else if (!_switching) { diff --git a/engines/titanic/game/sgt/sgt_state_room.cpp b/engines/titanic/game/sgt/sgt_state_room.cpp index 3ddfcfef5f..ca6acaef16 100644 --- a/engines/titanic/game/sgt/sgt_state_room.cpp +++ b/engines/titanic/game/sgt/sgt_state_room.cpp @@ -22,6 +22,7 @@ #include "titanic/game/sgt/sgt_state_room.h" #include "titanic/pet_control/pet_control.h" +#include "titanic/translation.h" namespace Titanic { @@ -141,7 +142,7 @@ bool CSGTStateRoom::EnterRoomMsg(CEnterRoomMsg *msg) { if (roomFlags == assignedRoom && getPassengerClass() == 3 && _statics->_announcementFlag) { // Congratulations, you may have won an upgrade - playSound("b#21.wav"); + playSound(TRANSLATE("b#21.wav", "b#2.wav")); _statics->_announcementFlag = false; } diff --git a/engines/titanic/game/sgt/toilet.cpp b/engines/titanic/game/sgt/toilet.cpp index 0bcb08fe38..a4541bf377 100644 --- a/engines/titanic/game/sgt/toilet.cpp +++ b/engines/titanic/game/sgt/toilet.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/sgt/toilet.h" +#include "titanic/translation.h" namespace Titanic { @@ -51,7 +52,7 @@ bool CToilet::TurnOn(CTurnOn *msg) { _startFrame = 0; _endFrame = 11; playMovie(0, 11, MOVIE_WAIT_FOR_FINISH); - playSound("b#1.wav"); + playSound(TRANSLATE("b#1.wav", "b#86.wav")); } return true; @@ -65,7 +66,7 @@ bool CToilet::TurnOff(CTurnOff *msg) { _startFrame = 11; _endFrame = 18; playMovie(11, 18, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); - playSound("b#1.wav"); + playSound(TRANSLATE("b#1.wav", "b#86.wav")); } return true; diff --git a/engines/titanic/game/sgt/washstand.cpp b/engines/titanic/game/sgt/washstand.cpp index 217e36c1e9..a087969dba 100644 --- a/engines/titanic/game/sgt/washstand.cpp +++ b/engines/titanic/game/sgt/washstand.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/sgt/washstand.h" +#include "titanic/translation.h" namespace Titanic { @@ -48,7 +49,7 @@ bool CWashstand::TurnOn(CTurnOn *msg) { _startFrame = 0; _endFrame = 14; playMovie(0, 14, MOVIE_WAIT_FOR_FINISH); - playSound("b#14.wav"); + playSound(TRANSLATE("b#14.wav", "b#99.wav")); } return true; @@ -62,7 +63,7 @@ bool CWashstand::TurnOff(CTurnOff *msg) { _startFrame = 14; _endFrame = 28; playMovie(14, 28, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); - playSound("b#14.wav"); + playSound(TRANSLATE("b#14.wav", "b#99.wav")); } return true; diff --git a/engines/titanic/game/speech_dispensor.cpp b/engines/titanic/game/speech_dispensor.cpp index 7f5580abb5..460cf0fdc1 100644 --- a/engines/titanic/game/speech_dispensor.cpp +++ b/engines/titanic/game/speech_dispensor.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/speech_dispensor.h" +#include "titanic/translation.h" namespace Titanic { @@ -85,7 +86,7 @@ bool CSpeechDispensor::FrameMsg(CFrameMsg *msg) { switch (_state) { case 0: - playSound("z#93.wav"); + playSound(TRANSLATE("z#93.wav", "z#624.wav")); if (_seasonNum == SEASON_WINTER) { petDisplayMessage(1, FROZEN_TO_BRANCH); _hitCounter = 0; @@ -120,7 +121,7 @@ bool CSpeechDispensor::FrameMsg(CFrameMsg *msg) { bool CSpeechDispensor::MouseButtonUpMsg(CMouseButtonUpMsg *msg) { if (!_speechFallen) { - playSound("z#93.wav"); + playSound(TRANSLATE("z#93.wav", "z#624.wav")); if (_failureType) { petDisplayMessage(1, OUT_OF_REACH); } else { diff --git a/engines/titanic/game/sub_glass.cpp b/engines/titanic/game/sub_glass.cpp index 48cc84815a..ced6f662e9 100644 --- a/engines/titanic/game/sub_glass.cpp +++ b/engines/titanic/game/sub_glass.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/sub_glass.h" +#include "titanic/translation.h" namespace Titanic { @@ -67,7 +68,7 @@ bool CSUBGlass::MouseButtonUpMsg(CMouseButtonUpMsg *msg) { if (!_fieldBC && _startFrame >= 0) { _fieldBC = true; playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT); - playSound("z#30.wav"); + playSound(TRANSLATE("z#30.wav", "z#561.wav")); } return true; @@ -89,7 +90,7 @@ bool CSUBGlass::SignalObject(CSignalObject *msg) { if (_signalStartFrame >= 0) { playMovie(_signalStartFrame, _signalEndFrame, MOVIE_WAIT_FOR_FINISH); - playSound("z#30.wav"); + playSound(TRANSLATE("z#30.wav", "z#561.wav")); _fieldBC = false; } } diff --git a/engines/titanic/game/television.cpp b/engines/titanic/game/television.cpp index 7c1e33cce4..be5d1ae40e 100644 --- a/engines/titanic/game/television.cpp +++ b/engines/titanic/game/television.cpp @@ -26,6 +26,7 @@ #include "titanic/debugger.h" #include "titanic/game/get_lift_eye2.h" #include "titanic/pet_control/pet_control.h" +#include "titanic/translation.h" namespace Titanic { @@ -245,8 +246,8 @@ bool CTelevision::MovieEndMsg(CMovieEndMsg *msg) { // You may be a winner CProximity prox1, prox2; prox1._soundType = prox2._soundType = Audio::Mixer::kSpeechSoundType; - playSound("z#47.wav", prox1); - _soundHandle = playSound("b#20.wav", prox2); + playSound(TRANSLATE("z#47.wav", "z#578.wav"), prox1); + _soundHandle = playSound(TRANSLATE("b#20.wav", "b#1.wav"), prox2); // Get the room flags for the SGT floor we're on CPetControl *pet = getPetControl(); diff --git a/engines/titanic/game/throw_tv_down_well.cpp b/engines/titanic/game/throw_tv_down_well.cpp index 680fc7e29f..ba01b32620 100644 --- a/engines/titanic/game/throw_tv_down_well.cpp +++ b/engines/titanic/game/throw_tv_down_well.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/throw_tv_down_well.h" +#include "titanic/translation.h" namespace Titanic { @@ -68,7 +69,7 @@ bool CThrowTVDownWell::EnterViewMsg(CEnterViewMsg *msg) { bool CThrowTVDownWell::MovieEndMsg(CMovieEndMsg *msg) { sleep(2000); changeView("ParrotLobby.Node 11.N"); - playSound("z#471.wav"); + playSound(TRANSLATE("z#471.wav", "z#208.wav")); addTimer(2, 7000, 0); return true; } @@ -77,19 +78,19 @@ bool CThrowTVDownWell::TimerMsg(CTimerMsg *msg) { if (msg->_actionVal == 1) { changeView("ParrotLobby.Node 10.N"); } else if (msg->_actionVal == 2) { - playSound("z#468.wav", 50); + playSound(TRANSLATE("z#468.wav", "z#205.wav"), 50); sleep(1500); changeView(_viewName); _viewName = "NULL"; unlockMouse(); - playSound("z#47.wav"); + playSound(TRANSLATE("z#47.wav", "z#578.wav")); } return true; } bool CThrowTVDownWell::MovieFrameMsg(CMovieFrameMsg *msg) { - playSound("z#470.wav"); + playSound(TRANSLATE("z#470.wav", "z#207.wav")); return true; } diff --git a/engines/titanic/game/up_lighter.cpp b/engines/titanic/game/up_lighter.cpp index b19d899603..115cd097f6 100644 --- a/engines/titanic/game/up_lighter.cpp +++ b/engines/titanic/game/up_lighter.cpp @@ -23,6 +23,7 @@ #include "titanic/game/up_lighter.h" #include "titanic/core/project_item.h" #include "titanic/npcs/parrot.h" +#include "titanic/translation.h" namespace Titanic { @@ -62,7 +63,7 @@ void CUpLighter::load(SimpleFile *file) { bool CUpLighter::MovieEndMsg(CMovieEndMsg *msg) { if (_hosePumping) { - playSound("z#47.wav"); + playSound(TRANSLATE("z#47.wav", "z#578.wav")); _noseDispensed = true; CVisibleMsg visibleMsg(true); diff --git a/engines/titanic/game/useless_lever.cpp b/engines/titanic/game/useless_lever.cpp index 82d8983710..74b6371c06 100644 --- a/engines/titanic/game/useless_lever.cpp +++ b/engines/titanic/game/useless_lever.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/useless_lever.h" +#include "titanic/translation.h" namespace Titanic { @@ -42,11 +43,11 @@ void CUselessLever::load(SimpleFile *file) { bool CUselessLever::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { if (_fieldE0) { playMovie(15, 30, 0); - playSound("z#56.wav"); + playSound(TRANSLATE("z#56.wav", "z#587.wav")); _fieldE0 = false; } else { playMovie(0, 14, 0); - playSound("z#56.wav"); + playSound(TRANSLATE("z#56.wav", "z#587.wav")); _fieldE0 = true; } diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp index 6eeccd345a..b8fddf2079 100644 --- a/engines/titanic/npcs/succubus.cpp +++ b/engines/titanic/npcs/succubus.cpp @@ -25,6 +25,7 @@ #include "titanic/carry/chicken.h" #include "titanic/core/view_item.h" #include "titanic/pet_control/pet_control.h" +#include "titanic/translation.h" namespace Titanic { @@ -289,7 +290,7 @@ bool CSuccUBus::SubAcceptCCarryMsg(CSubAcceptCCarryMsg *msg) { item->setVisible(false); if (_startFrame1 >= 0) { - playSound("z#23.wav"); + playSound(TRANSLATE("z#23.wav", "z#554.wav")); playMovie(_startFrame1, _endFrame1, 0); } @@ -366,7 +367,7 @@ bool CSuccUBus::LeaveViewMsg(CLeaveViewMsg *msg) { if (_isOn) { _isOn = false; if (_offStartFrame >= 0) - playSound("z#27.wav", 100); + playSound(TRANSLATE("z#27.wav", "z#558.wav"), 100); if (_signalFlag) setVisible(false); @@ -535,7 +536,7 @@ bool CSuccUBus::MovieEndMsg(CMovieEndMsg *msg) { if (msg->_endFrame == _offEndFrame) { if (_endingStartFrame >= 0) - playSound("z#30.wav", 100); + playSound(TRANSLATE("z#30.wav", "z#561.wav"), 100); if (_signalFlag) { _signalFlag = false; @@ -680,12 +681,12 @@ bool CSuccUBus::TurnOn(CTurnOn *msg) { if (pet) { if (!_signalFlag && _initialStartFrame >= 0) { playMovie(_initialStartFrame, _initialEndFrame, 0); - playSound("z#30.wav", 100); + playSound(TRANSLATE("z#30.wav", "z#561.wav"), 100); } if (_onStartFrame >= 0) { playMovie(_onStartFrame, _onEndFrame, MOVIE_NOTIFY_OBJECT); - playSound("z#26.wav", 100); + playSound(TRANSLATE("z#26.wav", "z#557.wav"), 100); } uint petRoomFlags = pet->getRoomFlags(); @@ -712,7 +713,7 @@ bool CSuccUBus::TurnOff(CTurnOff *msg) { } if (_offStartFrame >= 0) { - playSound("z#27.wav", 100); + playSound(TRANSLATE("z#27.wav", "z#558.wav"), 100); playMovie(_offStartFrame, _offEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } @@ -753,7 +754,7 @@ bool CSuccUBus::SUBTransition(CSUBTransition *msg) { bool CSuccUBus::SetChevRoomBits(CSetChevRoomBits *msg) { if (_isOn) { _destRoomFlags = msg->_roomFlags; - playSound("z#98.wav", 100); + playSound(TRANSLATE("z#98.wav", "z#629.wav"), 100); } return true; diff --git a/engines/titanic/npcs/titania.cpp b/engines/titanic/npcs/titania.cpp index d3e3395fc8..bfc0ba1bfd 100644 --- a/engines/titanic/npcs/titania.cpp +++ b/engines/titanic/npcs/titania.cpp @@ -21,6 +21,7 @@ */ #include "titanic/npcs/titania.h" +#include "titanic/translation.h" namespace Titanic { @@ -146,7 +147,7 @@ bool CTitania::ActMsg(CActMsg *msg) { if (msg->_action == "SleepTitania") { setVisible(true); playCutscene(52, 104); - playSound("z#47.wav", 100); + playSound(TRANSLATE("z#47.wav", "z#578.wav"), 100); changeView("Titania.Node 7.S", ""); // Re-enable control, and reset bomb's volume back to normal 60% @@ -178,7 +179,7 @@ bool CTitania::ActMsg(CActMsg *msg) { && _mouth && _visionCentre && _speechCentre && _olfactoryCentre && _auditoryCentre) { CProximity prox(Audio::Mixer::kSpeechSoundType); - playSound("z#47.wav", prox); + playSound(TRANSLATE("z#47.wav", "z#578.wav"), prox); CActMsg actMsg("Woken"); actMsg.execute("MouthSlot"); diff --git a/engines/titanic/sound/titania_speech.cpp b/engines/titanic/sound/titania_speech.cpp index c6365a828b..30446fd992 100644 --- a/engines/titanic/sound/titania_speech.cpp +++ b/engines/titanic/sound/titania_speech.cpp @@ -21,6 +21,7 @@ */ #include "titanic/sound/titania_speech.h" +#include "titanic/translation.h" namespace Titanic { @@ -57,7 +58,7 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) { CProximity prox(Audio::Mixer::kSpeechSoundType); switch (_actionNum) { case 1: - loadSound("a#12.wav"); + loadSound(TRANSLATE("a#12.wav", "a#0.wav")); sleep(1000); playMovie(0, 187, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); movieSetPlaying(true); @@ -65,7 +66,7 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) { break; case 2: - loadSound("a#11.wav"); + loadSound(TRANSLATE("a#11.wav", "a#4.wav")); addTimer(0); startAnimTimer("Para2", 300); addTimer(6000); @@ -78,25 +79,25 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) { case 3: visibleMsg._visible = false; visibleMsg.execute("TitaniaStillControl"); - loadSound("a#10.wav"); + loadSound(TRANSLATE("a#10.wav", "a#2.wav")); playMovie(585, 706, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); - playSound("a#10.wav", prox); + playSound(TRANSLATE("a#10.wav", "a#2.wav"), prox); break; case 4: visibleMsg._visible = false; visibleMsg.execute("TitaniaStillControl"); - loadSound("a#9.wav"); + loadSound(TRANSLATE("a#9.wav", "a#3.wav")); playMovie(707, 905, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); - playSound("a#9.wav", prox); + playSound(TRANSLATE("a#9.wav", "a#3.wav"), prox); break; case 5: visibleMsg._visible = false; visibleMsg.execute("TitaniaStillControl"); - loadSound("a#8.wav"); + loadSound(TRANSLATE("a#8.wav", "a#1.wav")); playMovie(906, 938, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); - playSound("a#8.wav", prox); + playSound(TRANSLATE("a#8.wav", "a#1.wav"), prox); break; default: @@ -125,7 +126,7 @@ bool CTitaniaSpeech::MovieFrameMsg(CMovieFrameMsg *msg) { int frame = getMovieFrame(); if (frame == 0) { CProximity prox(Audio::Mixer::kSpeechSoundType); - playSound("a#12.wav", prox); + playSound(TRANSLATE("a#12.wav", "a#0.wav"), prox); } return true; @@ -142,7 +143,7 @@ bool CTitaniaSpeech::TimerMsg(CTimerMsg *msg) { actMsg.execute(this); } else if (msg->_action == "Para2") { CProximity prox(Audio::Mixer::kSpeechSoundType); - playSound("a#11.wav", prox); + playSound(TRANSLATE("a#11.wav", "a#4.wav"), prox); } else { frameMsg._frameNumber = _backgroundFrame++; frameMsg.execute("TitaniaStillControl"); -- cgit v1.2.3