diff options
21 files changed, 81 insertions, 60 deletions
diff --git a/engines/titanic/carry/arm.cpp b/engines/titanic/carry/arm.cpp index 23b0710c30..0d31296818 100644 --- a/engines/titanic/carry/arm.cpp +++ b/engines/titanic/carry/arm.cpp @@ -22,6 +22,7 @@ #include "titanic/carry/arm.h" #include "titanic/messages/messages.h" +#include "titanic/translation.h" namespace Titanic { @@ -150,7 +151,7 @@ bool CArm::MaitreDHappyMsg(CMaitreDHappyMsg *msg) { CGameObject *petItem; if (find(getName(), &petItem, FIND_PET)) { if (!_armUnlocked) - playSound("z#47.wav"); + playSound(TRANSLATE("z#47.wav", "z#578.wav")); if (_heldItemName == "Key" || _heldItemName == "AuditoryCentre") { CGameObject *heldItem = dynamic_cast<CGameObject *>(getFirstChild()); if (heldItem) { diff --git a/engines/titanic/carry/brain.cpp b/engines/titanic/carry/brain.cpp index 73970c404c..b5fe1dfffa 100644 --- a/engines/titanic/carry/brain.cpp +++ b/engines/titanic/carry/brain.cpp @@ -22,6 +22,7 @@ #include "titanic/carry/brain.h" #include "titanic/game/brain_slot.h" +#include "titanic/translation.h" namespace Titanic { @@ -70,7 +71,7 @@ bool CBrain::UseWithOtherMsg(CUseWithOtherMsg *msg) { petMoveToHiddenRoom(); CAddHeadPieceMsg headpieceMsg(getName()); headpieceMsg.execute(msg->_other); - playSound("z#116.wav"); + playSound(TRANSLATE("z#116.wav", "z#647.wav")); setPosition(Point(0, 0)); setVisible(false); _pieceAdded = true; diff --git a/engines/titanic/carry/bridge_piece.cpp b/engines/titanic/carry/bridge_piece.cpp index f90f7cbd4d..12f6688fec 100644 --- a/engines/titanic/carry/bridge_piece.cpp +++ b/engines/titanic/carry/bridge_piece.cpp @@ -22,6 +22,7 @@ #include "titanic/carry/bridge_piece.h" #include "titanic/game/ship_setting.h" +#include "titanic/translation.h" namespace Titanic { @@ -60,7 +61,7 @@ bool CBridgePiece::UseWithOtherMsg(CUseWithOtherMsg *msg) { return true; } else { setVisible(false); - playSound("z#54.wav"); + playSound(TRANSLATE("z#54.wav", "z#585.wav")); setPosition(shipSetting->_pos1); shipSetting->_itemName = getName(); petMoveToHiddenRoom(); diff --git a/engines/titanic/carry/carry_parrot.cpp b/engines/titanic/carry/carry_parrot.cpp index c8747262b5..11e2880a17 100644 --- a/engines/titanic/carry/carry_parrot.cpp +++ b/engines/titanic/carry/carry_parrot.cpp @@ -27,6 +27,7 @@ #include "titanic/npcs/parrot.h" #include "titanic/npcs/succubus.h" #include "titanic/pet_control/pet_control.h" +#include "titanic/translation.h" namespace Titanic { @@ -121,7 +122,7 @@ bool CCarryParrot::MouseDragEndMsg(CMouseDragEndMsg *msg) { setVisible(false); _canTake = false; CParrot::_state = PARROT_ESCAPED; - playSound("z#475.wav"); + playSound(TRANSLATE("z#475.wav", "z#212.wav")); stopSoundChannel(true); moveUnder(findRoom()); @@ -136,7 +137,7 @@ bool CCarryParrot::MouseDragEndMsg(CMouseDragEndMsg *msg) { } else { setVisible(false); _canTake = false; - playSound("z#475.wav"); + playSound(TRANSLATE("z#475.wav", "z#212.wav")); stopSoundChannel(true); moveUnder(findRoom()); } @@ -170,7 +171,7 @@ bool CCarryParrot::PassOnDragStartMsg(CPassOnDragStartMsg *msg) { _canTake = false; CProximity prox(Audio::Mixer::kSpeechSoundType); - playSound("z#475.wav", prox); + playSound(TRANSLATE("z#475.wav", "z#212.wav"), prox); moveUnder(findRoom()); CParrot::_state = PARROT_ESCAPED; @@ -205,7 +206,7 @@ bool CCarryParrot::ActMsg(CActMsg *msg) { _canTake = false; if (CParrot::_state == PARROT_4) { - playSound("z#475.wav"); + playSound(TRANSLATE("z#475.wav", "z#212.wav")); if (!_feathersFlag) { CCarry *feathers = dynamic_cast<CCarry *>(getRoot()->findByName("Feathers")); diff --git a/engines/titanic/game/bar_bell.cpp b/engines/titanic/game/bar_bell.cpp index 5f17dffda1..448a7d2919 100644 --- a/engines/titanic/game/bar_bell.cpp +++ b/engines/titanic/game/bar_bell.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/bar_bell.h" +#include "titanic/translation.h" namespace Titanic { @@ -68,23 +69,23 @@ bool CBarBell::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { case 0: case 1: case 5: - playSound("c#54.wav", _volume, _soundVal3); + playSound(TRANSLATE("c#54.wav", "c#38.wav"), _volume, _soundVal3); break; case 2: - playSound("c#52.wav", _volume, _soundVal3); + playSound(TRANSLATE("c#52.wav", "c#36.wav"), _volume, _soundVal3); break; case 3: - playSound("c#53.wav", _volume, _soundVal3); + playSound(TRANSLATE("c#53.wav", "c#37.wav"), _volume, _soundVal3); break; case 4: - playSound("c#55.wav", _volume, _soundVal3); + playSound(TRANSLATE("c#55.wav", "c#39.wav"), _volume, _soundVal3); break; default: - playSound("c#51.wav", _volume, _soundVal3); + playSound(TRANSLATE("c#51.wav", "c#35.wav"), _volume, _soundVal3); break; } } else if (_fieldBC >= 5) { @@ -93,7 +94,7 @@ bool CBarBell::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { actMsg.execute("Barbot"); } - playSound("c#51.wav", _volume, _soundVal3); + playSound(TRANSLATE("c#51.wav", "c#35.wav"), _volume, _soundVal3); } else { if (_fieldBC == 3) { CActMsg actMsg("BellRing1"); @@ -103,7 +104,7 @@ bool CBarBell::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { actMsg.execute("Barbot"); } - playSound("c#54.wav", _volume, _soundVal3); + playSound(TRANSLATE("c#54.wav", "c#38.wav"), _volume, _soundVal3); } return true; diff --git a/engines/titanic/game/bowl_unlocker.cpp b/engines/titanic/game/bowl_unlocker.cpp index 06d70256c5..43e5d8a12d 100644 --- a/engines/titanic/game/bowl_unlocker.cpp +++ b/engines/titanic/game/bowl_unlocker.cpp @@ -22,6 +22,7 @@ #include "titanic/game/bowl_unlocker.h" #include "titanic/core/room_item.h" +#include "titanic/translation.h" namespace Titanic { @@ -60,7 +61,7 @@ bool CBowlUnlocker::MovieEndMsg(CMovieEndMsg *msg) { CNutPuzzleMsg puzzleMsg("BowlUnlocked"); puzzleMsg.execute(getRoom(), nullptr, MSGFLAG_SCAN); - playSound("z#47.wav"); + playSound(TRANSLATE("z#47.wav", "z#578.wav")); return true; } diff --git a/engines/titanic/game/bridge_view.cpp b/engines/titanic/game/bridge_view.cpp index 14361b4e8c..608724c16c 100644 --- a/engines/titanic/game/bridge_view.cpp +++ b/engines/titanic/game/bridge_view.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/bridge_view.h" +#include "titanic/translation.h" namespace Titanic { @@ -78,7 +79,7 @@ bool CBridgeView::ActMsg(CActMsg *msg) { CChangeMusicMsg musicMsg; musicMsg._flags = 1; musicMsg.execute("BridgeAutoMusicPlayer"); - playSound("a#42.wav"); + playSound(TRANSLATE("a#42.wav", "a#35.wav")); playMovie(MOVIE_NOTIFY_OBJECT); } } diff --git a/engines/titanic/game/captains_wheel.cpp b/engines/titanic/game/captains_wheel.cpp index 32582ed996..7beb29c072 100644 --- a/engines/titanic/game/captains_wheel.cpp +++ b/engines/titanic/game/captains_wheel.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/captains_wheel.h" +#include "titanic/translation.h" namespace Titanic { @@ -119,7 +120,7 @@ bool CCaptainsWheel::ActMsg(CActMsg *msg) { playMovie(162, 168, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } } else if (msg->_action == "SetDestin") { - playSound("a#44.wav"); + playSound(TRANSLATE("a#44.wav", "a#37.wav")); CSetVolumeMsg volumeMsg; volumeMsg._volume = 25; volumeMsg.execute("EngineSounds"); diff --git a/engines/titanic/game/cell_point_button.cpp b/engines/titanic/game/cell_point_button.cpp index 2afcf39f48..75b8772d19 100644 --- a/engines/titanic/game/cell_point_button.cpp +++ b/engines/titanic/game/cell_point_button.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/cell_point_button.h" +#include "titanic/translation.h" namespace Titanic { @@ -89,7 +90,7 @@ bool CCellPointButton::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { playMovie(0); _regionNum = _regionNum ? 0 : 1; - playSound("z#425.wav"); + playSound(TRANSLATE("z#425.wav", "z#170.wav")); talkSetDialRegion(_npcName, _dialNum, _regionNum); return true; diff --git a/engines/titanic/game/chicken_dispensor.cpp b/engines/titanic/game/chicken_dispensor.cpp index 692c364918..8d16289647 100644 --- a/engines/titanic/game/chicken_dispensor.cpp +++ b/engines/titanic/game/chicken_dispensor.cpp @@ -24,6 +24,7 @@ #include "titanic/carry/chicken.h" #include "titanic/core/project_item.h" #include "titanic/pet_control/pet_control.h" +#include "titanic/translation.h" namespace Titanic { @@ -90,7 +91,7 @@ bool CChickenDispensor::StatusChangeMsg(CStatusChangeMsg *msg) { if (_disabled) { playMovie(0, 12, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); - playSound("z#400.wav"); + playSound(TRANSLATE("z#400.wav", "z#145.wav")); } else { playMovie(12, 16, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } @@ -109,7 +110,7 @@ bool CChickenDispensor::MovieEndMsg(CMovieEndMsg *msg) { if (movieFrame == 16) { // Dispensed a chicken _cursorId = CURSOR_HAND; - playSound("b#50.wav", 50); + playSound(TRANSLATE("b#50.wav", "b#30.wav"), 50); CActMsg actMsg("Dispense Chicken"); actMsg.execute("Chicken"); @@ -156,7 +157,7 @@ bool CChickenDispensor::LeaveViewMsg(CLeaveViewMsg *msg) { } bool CChickenDispensor::EnterViewMsg(CEnterViewMsg *msg) { - playSound("b#51.wav"); + playSound(TRANSLATE("b#51.wav", "b#31.wav")); _dispensed = false; _cursorId = CURSOR_ARROW; return true; diff --git a/engines/titanic/game/desk_click_responder.cpp b/engines/titanic/game/desk_click_responder.cpp index 0650b3a1f5..efdf13fa92 100644 --- a/engines/titanic/game/desk_click_responder.cpp +++ b/engines/titanic/game/desk_click_responder.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/desk_click_responder.h" +#include "titanic/translation.h" namespace Titanic { @@ -52,7 +53,7 @@ bool CDeskClickResponder::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { uint ticks = getTicksCount(); if (!_ticks || ticks > (_ticks + 4000)) { - playSound("a#22.wav"); + playSound(TRANSLATE("a#22.wav", "a#17.wav")); _ticks = ticks; } diff --git a/engines/titanic/game/sgt/armchair.cpp b/engines/titanic/game/sgt/armchair.cpp index 6c0e7fe0ca..e9348f4484 100644 --- a/engines/titanic/game/sgt/armchair.cpp +++ b/engines/titanic/game/sgt/armchair.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/sgt/armchair.h" +#include "titanic/translation.h" namespace Titanic { @@ -56,7 +57,7 @@ bool CArmchair::TurnOn(CTurnOn *msg) { } playMovie(_startFrame, _endFrame, MOVIE_WAIT_FOR_FINISH); - playSound("b#0.wav"); + playSound(TRANSLATE("b#0.wav", "b#85.wav")); _statics->_armchair = "Open"; _isClosed = false; } @@ -71,7 +72,7 @@ bool CArmchair::TurnOff(CTurnOff *msg) { _endFrame = 21; _isClosed = true; playMovie(11, 21, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); - playSound("b#0.wav"); + playSound(TRANSLATE("b#0.wav", "b#85.wav")); } return true; diff --git a/engines/titanic/game/sgt/basin.cpp b/engines/titanic/game/sgt/basin.cpp index fe3216e002..2aef5bdc9d 100644 --- a/engines/titanic/game/sgt/basin.cpp +++ b/engines/titanic/game/sgt/basin.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/sgt/basin.h" +#include "titanic/translation.h" namespace Titanic { @@ -49,7 +50,7 @@ bool CBasin::TurnOn(CTurnOn *msg) { _startFrame = 0; _endFrame = 6; playMovie(0, 6, MOVIE_WAIT_FOR_FINISH); - playSound("b#13.wav"); + playSound(TRANSLATE("b#13.wav", "b#98.wav")); } return true; @@ -62,7 +63,7 @@ bool CBasin::TurnOff(CTurnOff *msg) { _startFrame = 8; _endFrame = 14; playMovie(8, 14, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); - playSound("b#13.wav"); + playSound(TRANSLATE("b#13.wav", "b#98.wav")); } return true; diff --git a/engines/titanic/game/sgt/bedfoot.cpp b/engines/titanic/game/sgt/bedfoot.cpp index 8f90e0f100..0cd4eec4a3 100644 --- a/engines/titanic/game/sgt/bedfoot.cpp +++ b/engines/titanic/game/sgt/bedfoot.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/sgt/bedfoot.h" +#include "titanic/translation.h" namespace Titanic { @@ -46,11 +47,11 @@ bool CBedfoot::TurnOn(CTurnOn *msg) { if (_statics->_washstand == "Open") { _endFrame = 13; _statics->_bedfoot = "Open"; - playSound("b#7.wav"); + playSound(TRANSLATE("b#7.wav", "b#92.wav")); } else { _endFrame = 17; _statics->_bedfoot = "NotOnWashstand"; - playSound("b#4.wav"); + playSound(TRANSLATE("b#4.wav", "b#89.wav")); } playMovie(_startFrame, _endFrame, MOVIE_WAIT_FOR_FINISH); @@ -95,7 +96,7 @@ bool CBedfoot::TurnOff(CTurnOff *msg) { } playMovie(_startFrame, _endFrame, MOVIE_WAIT_FOR_FINISH); - playSound("b#7.wav"); + playSound(TRANSLATE("b#7.wav", "b#92.wav")); } else if (_statics->_bedfoot == "NotOnWashstand" && _statics->_bedhead == "ClosedWrong") { _isClosed = true; @@ -110,14 +111,14 @@ bool CBedfoot::TurnOff(CTurnOff *msg) { } playMovie(_startFrame, _endFrame, MOVIE_WAIT_FOR_FINISH); - playSound("b#7.wav"); + playSound(TRANSLATE("b#7.wav", "b#92.wav")); } else if (_statics->_bedfoot == "RestingUTV" && _statics->_tv == "Closed") { _statics->_bedfoot = "Closed"; _startFrame = 25; _endFrame = 30; playMovie(25, 30, MOVIE_WAIT_FOR_FINISH); - playSound("b#7.wav"); + playSound(TRANSLATE("b#7.wav", "b#92.wav")); } if (_statics->_bedfoot == "Closed") diff --git a/engines/titanic/game/sgt/bedhead.cpp b/engines/titanic/game/sgt/bedhead.cpp index 7775ad38dc..b94c2cc46b 100644 --- a/engines/titanic/game/sgt/bedhead.cpp +++ b/engines/titanic/game/sgt/bedhead.cpp @@ -23,6 +23,7 @@ #include "titanic/game/sgt/bedhead.h" #include "titanic/support/files_manager.h" #include "titanic/titanic.h" +#include "titanic/translation.h" namespace Titanic { @@ -112,7 +113,7 @@ bool CBedhead::TurnOn(CTurnOn *msg) { _statics->_bedhead = entry._name4; playMovie(entry._startFrame, entry._endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); - playSound("b#6.wav"); + playSound(TRANSLATE("b#6.wav", "b#91.wav")); _isClosed = false; } } diff --git a/engines/titanic/game/sgt/chest_of_drawers.cpp b/engines/titanic/game/sgt/chest_of_drawers.cpp index d2d40c8e99..c9664d21ea 100644 --- a/engines/titanic/game/sgt/chest_of_drawers.cpp +++ b/engines/titanic/game/sgt/chest_of_drawers.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/sgt/chest_of_drawers.h" +#include "titanic/translation.h" namespace Titanic { @@ -47,7 +48,7 @@ bool CChestOfDrawers::TurnOn(CTurnOn *msg) { _startFrame = 1; _endFrame = 14; playMovie(1, 14, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); - playSound("b#11.wav"); + playSound(TRANSLATE("b#11.wav", "b#96.wav")); } return true; @@ -63,7 +64,7 @@ bool CChestOfDrawers::TurnOff(CTurnOff *msg) { _startFrame = 14; _endFrame = 27; playMovie(14, 27, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); - playSound("b#11.wav"); + playSound(TRANSLATE("b#11.wav", "b#96.wav")); } return true; diff --git a/engines/titanic/game/sgt/desk.cpp b/engines/titanic/game/sgt/desk.cpp index 1aea9a8ab3..3bc76e703c 100644 --- a/engines/titanic/game/sgt/desk.cpp +++ b/engines/titanic/game/sgt/desk.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/sgt/desk.h" +#include "titanic/translation.h" namespace Titanic { @@ -48,7 +49,7 @@ bool CDesk::TurnOn(CTurnOn *msg) { _startFrame = 1; _endFrame = 26; playMovie(1, 26, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); - playSound("b#12.wav"); + playSound(TRANSLATE("b#12.wav", "b#97.wav")); } return true; @@ -65,7 +66,7 @@ bool CDesk::TurnOff(CTurnOff *msg) { _startFrame = 26; _endFrame = 51; playMovie(26, 51, MOVIE_WAIT_FOR_FINISH); - playSound("b#9.wav"); + playSound(TRANSLATE("b#9.wav", "b#94.wav")); } return true; diff --git a/engines/titanic/game/sgt/deskchair.cpp b/engines/titanic/game/sgt/deskchair.cpp index 23b6ad64d7..c1363a4e03 100644 --- a/engines/titanic/game/sgt/deskchair.cpp +++ b/engines/titanic/game/sgt/deskchair.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/sgt/deskchair.h" +#include "titanic/translation.h" namespace Titanic { @@ -49,7 +50,7 @@ bool CDeskchair::TurnOn(CTurnOn *msg) { _startFrame = 0; _endFrame = 16; playMovie(0, 16, MOVIE_WAIT_FOR_FINISH); - playSound("b#8.wav"); + playSound(TRANSLATE("b#8.wav", "b#93.wav")); } return true; @@ -62,7 +63,7 @@ bool CDeskchair::TurnOff(CTurnOff *msg) { _startFrame = 16; _endFrame = 32; playMovie(16, 32, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); - playSound("b#2.wav"); + playSound(TRANSLATE("b#2.wav", "b#87.wav")); } return true; diff --git a/engines/titanic/messages/bilge_dispensor_event.cpp b/engines/titanic/messages/bilge_dispensor_event.cpp index c0bb289a00..f88ecbd2dc 100644 --- a/engines/titanic/messages/bilge_dispensor_event.cpp +++ b/engines/titanic/messages/bilge_dispensor_event.cpp @@ -23,6 +23,7 @@ #include "titanic/messages/bilge_dispensor_event.h" #include "titanic/events.h" #include "titanic/titanic.h" +#include "titanic/translation.h" namespace Titanic { @@ -66,7 +67,7 @@ bool CBilgeDispensorEvent::FrameMsg(CFrameMsg *msg) { if (getRandomNumber(2) == 0) { int volume = 20 + getRandomNumber(30); int balance = getRandomNumber(20) - 10; - _soundHandle = playSound("b#18.wav", volume, balance); + _soundHandle = playSound(TRANSLATE("b#18.wav", "b#102.wav"), volume, balance); } else { _ticksDelayEnd = ticks + 1000; } diff --git a/engines/titanic/npcs/barbot.cpp b/engines/titanic/npcs/barbot.cpp index 2ba150a38c..029861fa49 100644 --- a/engines/titanic/npcs/barbot.cpp +++ b/engines/titanic/npcs/barbot.cpp @@ -23,6 +23,7 @@ #include "titanic/npcs/barbot.h" #include "titanic/support/files_manager.h" #include "titanic/titanic.h" +#include "titanic/translation.h" namespace Titanic { @@ -243,7 +244,7 @@ bool CBarbot::ActMsg(CActMsg *msg) { _field160 = 1; _addedTV = true; - playSound("c#5.wav", _volume); + playSound(TRANSLATE("c#5.wav", "c#65.wav"), _volume); playRange(_frames[35], MOVIE_NOTIFY_OBJECT); movieEvent(); playRange(_frames[34]); @@ -415,12 +416,12 @@ bool CBarbot::MovieEndMsg(CMovieEndMsg *msg) { if (msg->_endFrame == _frames[57]._endFrame) { startTalking(this, 250575); - playSound("c#10.wav", _volume); + playSound(TRANSLATE("c#10.wav", "c#70.wav"), _volume); return true; } if (msg->_endFrame == _frames[55]._endFrame) { - playSound("c#10.wav", _volume); + playSound(TRANSLATE("c#10.wav", "c#70.wav"), _volume); return true; } @@ -476,22 +477,22 @@ bool CBarbot::MovieEndMsg(CMovieEndMsg *msg) { } if (msg->_endFrame == _frames[38]._endFrame || msg->_endFrame == _frames[23]._endFrame) { - playSound("c#3.wav", _volume); + playSound(TRANSLATE("c#3.wav", "c#63.wav"), _volume); } else if (msg->_endFrame == _frames[36]._endFrame) { - playSound("c#6.wav", _volume); + playSound(TRANSLATE("c#6.wav", "c#66.wav"), _volume); } else if (msg->_endFrame == _frames[35]._endFrame) { - playSound("c#8.wav", _volume); + playSound(TRANSLATE("c#8.wav", "c#68.wav"), _volume); } else if (msg->_endFrame == _frames[33]._endFrame) { - playSound("c#4.wav", _volume); + playSound(TRANSLATE("c#4.wav", "c#64.wav"), _volume); } else if (msg->_endFrame == _frames[32]._endFrame) { startTalking(this, 145); - playSound("c#9.wav", _volume); + playSound(TRANSLATE("c#9.wav", "c#69.wav"), _volume); } else if (msg->_endFrame == _frames[47]._endFrame) { - playSound("c#9.wav", _volume); + playSound(TRANSLATE("c#9.wav", "c#69.wav"), _volume); _addedVodka = true; _drunkFlag = true; } else if (msg->_endFrame == _frames[30]._endFrame) { - playSound("c#4.wav", 60); + playSound(TRANSLATE("c#4.wav", "c#64.wav"), 60); } else if (msg->_endFrame == _frames[29]._endFrame) { if (!_fieldC4) { performAction(true, nullptr); @@ -700,7 +701,7 @@ bool CBarbot::LoadSuccessMsg(CLoadSuccessMsg *msg) { bool CBarbot::MovieFrameMsg(CMovieFrameMsg *msg) { if (msg->_frameNumber == _frames[29]._startFrame) { - playSound("c#2.wav", _volume); + playSound(TRANSLATE("c#2.wav", "c#62.wav"), _volume); } else if (msg->_frameNumber == _frames[55]._startFrame || msg->_frameNumber == _frames[32]._startFrame) { diff --git a/engines/titanic/npcs/bilge_succubus.cpp b/engines/titanic/npcs/bilge_succubus.cpp index 312f067bd4..827e39fb4b 100644 --- a/engines/titanic/npcs/bilge_succubus.cpp +++ b/engines/titanic/npcs/bilge_succubus.cpp @@ -24,6 +24,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 { @@ -80,7 +81,7 @@ bool CBilgeSuccUBus::PETReceiveMsg(CPETReceiveMsg *msg) { if (_afterReceiveStartFrame >= 0) playMovie(_afterReceiveStartFrame, _afterReceiveEndFrame, MOVIE_WAIT_FOR_FINISH); - playSound("z#28.wav", 70); + playSound(TRANSLATE("z#28.wav", "z#559.wav"), 70); } else if (!_isOn) { petDisplayMessage(2, SUCCUBUS_IS_IN_STANDBY); return false; @@ -184,10 +185,10 @@ bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) { if (msg->_endFrame == _trayOutEndFrame) { if (_offStartFrame >= 0) - playSound("z#27.wav"); + playSound(TRANSLATE("z#27.wav", "z#558.wav")); } else if (msg->_endFrame == _offEndFrame) { if (_endingStartFrame >= 0) - playSound("z#30.wav"); + playSound(TRANSLATE("z#30.wav", "z#561.wav")); } else { if (msg->_endFrame == _onEndFrame && pet) { if (_motherBlocked) { @@ -212,11 +213,11 @@ bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) { switch (_sendAction) { case SA_EATEN: stopSound(_soundHandle, 1); - _soundHandle = playSound("z#3.wav", 1); + _soundHandle = playSound(TRANSLATE("z#3.wav", "z#539.wav"), 1); break; case SA_BILGE_FEATHERS: stopSound(_soundHandle); - _soundHandle = playSound("z#12.wav"); + _soundHandle = playSound(TRANSLATE("z#12.wav", "z#532.wav")); break; case SA_BILGE_SENT: if (_isChicken) { @@ -250,8 +251,8 @@ bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) { } } else if (msg->_endFrame == _sneezing1EndFrame) { - playSound("z#25.wav", 70); - playSound("z#24.wav", 70); + playSound(TRANSLATE("z#25.wav", "z#556.wav"), 70); + playSound(TRANSLATE("z#24.wav", "z#555.wav"), 70); } else if (msg->_endFrame == _sneezing2EndFrame) { changeView("BilgeRoomWith.Node 1.N", ""); @@ -337,7 +338,7 @@ bool CBilgeSuccUBus::SubAcceptCCarryMsg(CSubAcceptCCarryMsg *msg) { petContainerRemove(item); pet->phonographAction(""); item->setVisible(false); - playSound("z#23.wav"); + playSound(TRANSLATE("z#23.wav", "z#554.wav")); CChicken *chicken = dynamic_cast<CChicken *>(item); bool chickenFlag = chicken ? chicken->_condiment == "None" : false; @@ -399,7 +400,7 @@ bool CBilgeSuccUBus::LeaveViewMsg(CLeaveViewMsg *msg) { if (_isOn) { _isOn = false; if (_offStartFrame >= 0) - playSound("z#27.wav"); + playSound(TRANSLATE("z#27.wav", "z#558.wav")); } performAction(true); @@ -422,7 +423,7 @@ bool CBilgeSuccUBus::TurnOn(CTurnOn *msg) { if (pet) { if (_onStartFrame >= 0) { playMovie(_onStartFrame, _onEndFrame, MOVIE_NOTIFY_OBJECT); - playSound("z#26.wav"); + playSound(TRANSLATE("z#26.wav", "z#557.wav")); } if (mailExists(pet->getRoomFlags()) && _okStartFrame >= 0) |