[Scummvm-git-logs] scummvm master -> 9127f5245fe10bc9de8efea5a9050d980f3ef241
dreammaster
dreammaster at scummvm.org
Thu Sep 21 04:33:25 CEST 2017
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9127f5245f TITANIC: DE: Adding sound translations
Commit: 9127f5245fe10bc9de8efea5a9050d980f3ef241
https://github.com/scummvm/scummvm/commit/9127f5245fe10bc9de8efea5a9050d980f3ef241
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-20T22:33:18-04:00
Commit Message:
TITANIC: DE: Adding sound translations
Changed paths:
engines/titanic/carry/eye.cpp
engines/titanic/carry/photograph.cpp
engines/titanic/game/code_wheel.cpp
engines/titanic/game/fan_control.cpp
engines/titanic/game/fan_noises.cpp
engines/titanic/game/glass_smasher.cpp
engines/titanic/game/gondolier/gondolier_mixer.cpp
engines/titanic/game/hammer_dispensor_button.cpp
engines/titanic/game/light.cpp
engines/titanic/game/long_stick_dispenser.cpp
engines/titanic/game/maitred/maitred_body.cpp
engines/titanic/game/missiveomat.cpp
engines/titanic/game/nav_helmet.cpp
engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
engines/titanic/game/parrot/parrot_nut_eater.cpp
engines/titanic/game/record_phonograph_button.cpp
engines/titanic/game/replacement_ear.cpp
engines/titanic/game/sgt/drawer.cpp
engines/titanic/gfx/music_slider_pitch.cpp
engines/titanic/gfx/music_slider_speed.cpp
engines/titanic/gfx/music_switch_inversion.cpp
engines/titanic/gfx/music_switch_reverse.cpp
engines/titanic/gfx/music_voice_mute.cpp
engines/titanic/moves/exit_bridge.cpp
engines/titanic/npcs/doorbot.cpp
engines/titanic/npcs/parrot.cpp
engines/titanic/npcs/parrot_succubus.cpp
diff --git a/engines/titanic/carry/eye.cpp b/engines/titanic/carry/eye.cpp
index 9bad0e4..3a61cd5 100644
--- a/engines/titanic/carry/eye.cpp
+++ b/engines/titanic/carry/eye.cpp
@@ -26,7 +26,7 @@
#include "titanic/game/television.h"
#include "titanic/game/transport/lift.h"
#include "titanic/pet_control/pet_control.h"
-
+#include "titanic/translation.h"
namespace Titanic {
@@ -108,7 +108,7 @@ bool CEye::ActMsg(CActMsg *msg) {
if (msg->_action == "BellbotGetLight") {
setVisible(true);
petAddToInventory();
- playSound("z#47.wav");
+ playSound(TRANSLATE("z#47.wav", "z#578.wav"));
CActMsg actMsg("Eye Removed");
actMsg.execute("1stClassState", CLight::_type,
diff --git a/engines/titanic/carry/photograph.cpp b/engines/titanic/carry/photograph.cpp
index cdf4648..a1af91e 100644
--- a/engines/titanic/carry/photograph.cpp
+++ b/engines/titanic/carry/photograph.cpp
@@ -23,6 +23,7 @@
#include "titanic/carry/photograph.h"
#include "titanic/core/dont_save_file_item.h"
#include "titanic/core/room_item.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -63,7 +64,7 @@ bool CPhotograph::MouseDragEndMsg(CMouseDragEndMsg *msg) {
if (target && target->isEquals("NavigationComputer")) {
moveUnder(getDontSave());
makeDirty();
- playSound("a#46.wav");
+ playSound(TRANSLATE("a#46.wav", "a#39.wav"));
starFn(STAR_SET_REFERENCE);
showMouse();
return true;
diff --git a/engines/titanic/game/code_wheel.cpp b/engines/titanic/game/code_wheel.cpp
index 1df99ae..441c481 100644
--- a/engines/titanic/game/code_wheel.cpp
+++ b/engines/titanic/game/code_wheel.cpp
@@ -22,6 +22,8 @@
#include "titanic/game/code_wheel.h"
#include "titanic/titanic.h"
+#include "titanic/translation.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -91,7 +93,7 @@ bool CodeWheel::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
_value = (_value <= 0) ? 14 : _value - 1;
}
- playSound("z#59.wav");
+ playSound(TRANSLATE("z#59.wav", "z#590.wav"));
return true;
}
diff --git a/engines/titanic/game/fan_control.cpp b/engines/titanic/game/fan_control.cpp
index fc99bd8..689f66e 100644
--- a/engines/titanic/game/fan_control.cpp
+++ b/engines/titanic/game/fan_control.cpp
@@ -21,6 +21,7 @@
*/
#include "titanic/game/fan_control.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -74,7 +75,7 @@ bool CFanControl::ActMsg(CActMsg *msg) {
bool CFanControl::StatusChangeMsg(CStatusChangeMsg *msg) {
if (!_starlingsDying) {
- playSound("z#42.wav");
+ playSound(TRANSLATE("z#42.wav", "z#743.wav"));
if (_enabled) {
switch (msg->_newStatus) {
case 1:
diff --git a/engines/titanic/game/fan_noises.cpp b/engines/titanic/game/fan_noises.cpp
index 7ddf919..1a5a46a 100644
--- a/engines/titanic/game/fan_noises.cpp
+++ b/engines/titanic/game/fan_noises.cpp
@@ -22,6 +22,7 @@
#include "titanic/game/fan_noises.h"
#include "titanic/core/room_item.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -75,12 +76,12 @@ bool CFanNoises::EnterRoomMsg(CEnterRoomMsg *msg) {
switch (_state) {
case 1:
- _soundHandle = playSound("b#60.wav", 0, _soundBalance, true);
+ _soundHandle = playSound(TRANSLATE("b#60.wav", "b#40.wav"), 0, _soundBalance, true);
setSoundVolume(_soundHandle, _soundPercent, _soundSeconds);
_startFlag = true;
break;
case 2:
- _soundHandle = playSound("b#58.wav", 0, _soundBalance, true);
+ _soundHandle = playSound(TRANSLATE("b#58.wav", "b#38.wav"), 0, _soundBalance, true);
setSoundVolume(_soundHandle, _soundPercent, _soundSeconds);
_startFlag = true;
break;
@@ -122,7 +123,7 @@ bool CFanNoises::StatusChangeMsg(CStatusChangeMsg *msg) {
switch (oldState) {
case 1:
case 2:
- playSound("b#59.wav", _soundPercent, _soundBalance);
+ playSound(TRANSLATE("b#59.wav", "b#39.wav"), _soundPercent, _soundBalance);
break;
default:
break;
@@ -140,7 +141,7 @@ bool CFanNoises::StatusChangeMsg(CStatusChangeMsg *msg) {
switch (oldState) {
case 0:
case 2:
- _soundHandle = playSound("b#60.wav", _soundPercent, _soundBalance, true);
+ _soundHandle = playSound(TRANSLATE("b#60.wav", "b#40.wav"), _soundPercent, _soundBalance, true);
_startFlag = true;
break;
default:
@@ -157,7 +158,7 @@ bool CFanNoises::StatusChangeMsg(CStatusChangeMsg *msg) {
}
if (oldState == 1) {
- _soundHandle = playSound("b#58.wav", _soundPercent, _soundBalance, true);
+ _soundHandle = playSound(TRANSLATE("b#58.wav", "b#38.wav"), _soundPercent, _soundBalance, true);
_startFlag = true;
}
break;
@@ -186,13 +187,13 @@ bool CFanNoises::LoadSuccessMsg(CLoadSuccessMsg *msg) {
switch (_state) {
case 1:
- playSound("b#60.wav", 0, _soundBalance, true);
+ playSound(TRANSLATE("b#60.wav", "b#40.wav"), 0, _soundBalance, true);
setSoundVolume(_soundHandle, _soundPercent, _soundSeconds);
_startFlag = true;
break;
case 2:
- playSound("b#58.wav", 0, _soundBalance, true);
+ playSound(TRANSLATE("b#58.wav", "b#38.wav"), 0, _soundBalance, true);
setSoundVolume(_soundHandle, _soundPercent, _soundSeconds);
_startFlag = true;
break;
diff --git a/engines/titanic/game/glass_smasher.cpp b/engines/titanic/game/glass_smasher.cpp
index 7de034c..240c9cd 100644
--- a/engines/titanic/game/glass_smasher.cpp
+++ b/engines/titanic/game/glass_smasher.cpp
@@ -21,6 +21,7 @@
*/
#include "titanic/game/glass_smasher.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -41,7 +42,7 @@ void CGlassSmasher::load(SimpleFile *file) {
bool CGlassSmasher::StatusChangeMsg(CStatusChangeMsg *msg) {
setVisible(true);
- playSound("b#40.wav");
+ playSound(TRANSLATE("b#40.wav", "b#19.wav"));
playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
return true;
}
diff --git a/engines/titanic/game/gondolier/gondolier_mixer.cpp b/engines/titanic/game/gondolier/gondolier_mixer.cpp
index e71562f..da0e722 100644
--- a/engines/titanic/game/gondolier/gondolier_mixer.cpp
+++ b/engines/titanic/game/gondolier/gondolier_mixer.cpp
@@ -22,6 +22,7 @@
#include "titanic/game/gondolier/gondolier_mixer.h"
#include "titanic/core/room_item.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -173,7 +174,7 @@ bool CGondolierMixer::SignalObject(CSignalObject *msg) {
CVisibleMsg visibleMsg;
visibleMsg.execute("Mouth");
- playSound("z#47.wav");
+ playSound(TRANSLATE("z#47.wav", "z#578.wav"));
} else {
CSetVolumeMsg volumeMsg(_volume1, 2);
volumeMsg.execute(this);
diff --git a/engines/titanic/game/hammer_dispensor_button.cpp b/engines/titanic/game/hammer_dispensor_button.cpp
index 661a92e..275ef20 100644
--- a/engines/titanic/game/hammer_dispensor_button.cpp
+++ b/engines/titanic/game/hammer_dispensor_button.cpp
@@ -21,6 +21,7 @@
*/
#include "titanic/game/hammer_dispensor_button.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -68,7 +69,7 @@ bool CHammerDispensorButton::PuzzleSolvedMsg(CPuzzleSolvedMsg *msg) {
}
bool CHammerDispensorButton::MouseButtonUpMsg(CMouseButtonUpMsg *msg) {
- playSound("z#93.wav");
+ playSound(TRANSLATE("z#93.wav", "z#624.wav"));
petDisplayMessage(1, POKE_WITH_LONG_STICK);
return true;
}
@@ -97,7 +98,7 @@ bool CHammerDispensorButton::FrameMsg(CFrameMsg *msg) {
if (!_open) {
if (flag) {
- playSound("z#93.wav");
+ playSound(TRANSLATE("z#93.wav", "z#624.wav"));
if (++_hitCounter == 5) {
if (!_hammerTaken) {
CActMsg actMsg(_msgAction);
diff --git a/engines/titanic/game/light.cpp b/engines/titanic/game/light.cpp
index 30fc534..cd2d9f3 100644
--- a/engines/titanic/game/light.cpp
+++ b/engines/titanic/game/light.cpp
@@ -23,6 +23,7 @@
#include "titanic/game/light.h"
#include "titanic/game/television.h"
#include "titanic/pet_control/pet_control.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -109,10 +110,10 @@ bool CLight::StatusChangeMsg(CStatusChangeMsg *msg) {
if (_eyePresent && isYourStateroom) {
petDisplayMessage(1, LIGHT_IS_LOOSE);
- playSound("z#144.wav", 70);
+ playSound(TRANSLATE("z#144.wav", "z#700.wav"), 70);
} else {
petDisplayMessage(1, LUMI_GLOW_LIGHTS);
- playSound("z#62.wav", 70);
+ playSound(TRANSLATE("z#62.wav", "z#593.wav"), 70);
}
return true;
@@ -124,10 +125,10 @@ bool CLight::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
if (_eyePresent && isYourStateroom) {
petDisplayMessage(1, LIGHT_IS_LOOSE);
- playSound("z#144.wav", 70);
+ playSound(TRANSLATE("z#144.wav", "z#700.wav"), 70);
} else {
petDisplayMessage(1, LUMI_GLOW_LIGHTS);
- playSound("z#62.wav", 70);
+ playSound(TRANSLATE("z#62.wav", "z#593.wav"), 70);
}
return true;
diff --git a/engines/titanic/game/long_stick_dispenser.cpp b/engines/titanic/game/long_stick_dispenser.cpp
index c340cae..50d46e4 100644
--- a/engines/titanic/game/long_stick_dispenser.cpp
+++ b/engines/titanic/game/long_stick_dispenser.cpp
@@ -23,6 +23,7 @@
#include "titanic/game/long_stick_dispenser.h"
#include "titanic/core/project_item.h"
#include "titanic/titanic.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -62,7 +63,7 @@ bool CLongStickDispenser::PuzzleSolvedMsg(CPuzzleSolvedMsg *msg) {
_fieldC0 = 1;
loadFrame(19);
} else if (_fieldC0 != 1) {
- playSound(g_vm->isGerman() ? "z#594.wav" : "z#63.wav");
+ playSound(TRANSLATE("z#63.wav", "z#594.wav"));
petDisplayMessage(1, GLASS_IS_UNBREAKABLE);
}
@@ -89,7 +90,7 @@ bool CLongStickDispenser::EnterRoomMsg(CEnterRoomMsg *msg) {
bool CLongStickDispenser::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
if (!_fieldC0) {
- playSound("z#62.wav");
+ playSound(TRANSLATE("z#62.wav", "z#593.wav"));
switch (_fieldBC) {
case 0:
diff --git a/engines/titanic/game/maitred/maitred_body.cpp b/engines/titanic/game/maitred/maitred_body.cpp
index 4cb12aa..4f8ca30 100644
--- a/engines/titanic/game/maitred/maitred_body.cpp
+++ b/engines/titanic/game/maitred/maitred_body.cpp
@@ -21,6 +21,7 @@
*/
#include "titanic/game/maitred/maitred_body.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -66,7 +67,7 @@ bool CMaitreDBody::ActMsg(CActMsg *msg) {
if (msg->_action == "LoseArm") {
_armed = false;
loadFrame(262);
- playSound("c#75.wav");
+ playSound(TRANSLATE("c#75.wav", "c#57.wav"));
}
return true;
diff --git a/engines/titanic/game/missiveomat.cpp b/engines/titanic/game/missiveomat.cpp
index c2f181d..e60f695 100644
--- a/engines/titanic/game/missiveomat.cpp
+++ b/engines/titanic/game/missiveomat.cpp
@@ -24,6 +24,7 @@
#include "titanic/core/room_item.h"
#include "titanic/support/files_manager.h"
#include "titanic/titanic.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -90,7 +91,7 @@ bool CMissiveOMat::KeyCharMsg(CKeyCharMsg *msg) {
if (!msg->_key)
return true;
- playSound("z#228.wav");
+ playSound(TRANSLATE("z#228.wav", "z#134.wav"));
editMsg._mode = EDIT_KEYPRESS;
editMsg._param = msg->_key;
editMsg.execute(loginControl);
@@ -120,7 +121,7 @@ bool CMissiveOMat::KeyCharMsg(CKeyCharMsg *msg) {
if (!msg->_key)
return true;
- playSound("z#228.wav");
+ playSound(TRANSLATE("z#228.wav", "z#134.wav"));
editMsg._mode = EDIT_KEYPRESS;
editMsg._param = msg->_key;
editMsg.execute(loginControl);
diff --git a/engines/titanic/game/nav_helmet.cpp b/engines/titanic/game/nav_helmet.cpp
index 6a54d01..ba3be2b 100644
--- a/engines/titanic/game/nav_helmet.cpp
+++ b/engines/titanic/game/nav_helmet.cpp
@@ -23,6 +23,7 @@
#include "titanic/game/nav_helmet.h"
#include "titanic/pet_control/pet_control.h"
#include "titanic/star_control/star_control.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -85,8 +86,8 @@ bool CNavHelmet::PETHelmetOnOffMsg(CPETHelmetOnOffMsg *msg) {
setVisible(true);
starFn(STAR_HIDE);
playMovie(61, 120, MOVIE_NOTIFY_OBJECT);
- playSound("a#47.wav");
- playSound("a#48.wav");
+ playSound(TRANSLATE("a#47.wav", "a#40.wav"));
+ playSound(TRANSLATE("a#48.wav", "a#41.wav"));
if (pet) {
pet->decAreaLocks();
@@ -99,8 +100,8 @@ bool CNavHelmet::PETHelmetOnOffMsg(CPETHelmetOnOffMsg *msg) {
_helmetOn = true;
setVisible(true);
playMovie(0, 60, MOVIE_NOTIFY_OBJECT);
- playSound("a#48.wav");
- playSound("a#47.wav");
+ playSound(TRANSLATE("a#48.wav", "a#41.wav"));
+ playSound(TRANSLATE("a#47.wav", "a#40.wav"));
}
return true;
@@ -131,10 +132,10 @@ bool CNavHelmet::PETStarFieldLockMsg(CPETStarFieldLockMsg *msg) {
// but now it will also not play the sounds in
// photoview
if (msg->_value) {
- playSound("a#6.wav");
+ playSound(TRANSLATE("a#6.wav", "a#58.wav"));
starFn(LOCK_STAR);
} else {
- playSound("a#5.wav");
+ playSound(TRANSLATE("a#5.wav", "a#57.wav"));
starFn(UNLOCK_STAR);
}
}
diff --git a/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp b/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
index 56c096e..440c874 100644
--- a/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
+++ b/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
@@ -22,6 +22,7 @@
#include "titanic/game/parrot/parrot_nut_bowl_actor.h"
#include "titanic/core/room_item.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -70,7 +71,7 @@ bool CParrotNutBowlActor::BowlStateChangeMsg(CBowlStateChangeMsg *msg) {
if (!_puzzleDone) {
CReplaceBowlAndNutsMsg replaceMsg;
replaceMsg.execute(findRoom(), nullptr, MSGFLAG_SCAN);
- playSound("z#47.wav");
+ playSound(TRANSLATE("z#47.wav", "z#578.wav"));
}
_puzzleDone = true;
diff --git a/engines/titanic/game/parrot/parrot_nut_eater.cpp b/engines/titanic/game/parrot/parrot_nut_eater.cpp
index c8d9446..4e0476d 100644
--- a/engines/titanic/game/parrot/parrot_nut_eater.cpp
+++ b/engines/titanic/game/parrot/parrot_nut_eater.cpp
@@ -22,6 +22,7 @@
#include "titanic/game/parrot/parrot_nut_eater.h"
#include "titanic/core/room_item.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -55,7 +56,7 @@ bool CParrotNutEater::MovieEndMsg(CMovieEndMsg *msg) {
CNutPuzzleMsg nutMsg("NutsGone");
nutMsg.execute(getRoom(), nullptr, MSGFLAG_SCAN);
- playSound("z#47.wav");
+ playSound(TRANSLATE("z#47.wav", "z#578.wav"));
return true;
}
@@ -70,7 +71,7 @@ bool CParrotNutEater::NutPuzzleMsg(CNutPuzzleMsg *msg) {
playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
movieEvent(68);
movieEvent(132);
- playSound("z#215.wav");
+ playSound(TRANSLATE("z#215.wav", "z#6.wav"));
CTrueTalkTriggerActionMsg triggerMsg;
triggerMsg._param1 = triggerMsg._param2 = 0;
@@ -85,10 +86,10 @@ bool CParrotNutEater::MovieFrameMsg(CMovieFrameMsg *msg) {
switch (msg->_frameNumber) {
case 68:
- playSound("z#214.wav", prox);
+ playSound(TRANSLATE("z#214.wav", "z#5.wav"), prox);
break;
case 132:
- playSound("z#216.wav", prox);
+ playSound(TRANSLATE("z#216.wav", "z#7.wav"), prox);
break;
default:
break;
diff --git a/engines/titanic/game/record_phonograph_button.cpp b/engines/titanic/game/record_phonograph_button.cpp
index 1bd2060..a521839 100644
--- a/engines/titanic/game/record_phonograph_button.cpp
+++ b/engines/titanic/game/record_phonograph_button.cpp
@@ -21,6 +21,7 @@
*/
#include "titanic/game/record_phonograph_button.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -46,7 +47,7 @@ bool CRecordPhonographButton::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
recordMsg.execute(getParent());
if (recordMsg._canRecord) {
- playSound("z#58.wav");
+ playSound(TRANSLATE("z#58.wav", "z#589.wav"));
loadFrame(1);
_active = true;
}
@@ -56,7 +57,7 @@ bool CRecordPhonographButton::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
bool CRecordPhonographButton::PhonographStopMsg(CPhonographStopMsg *msg) {
if (_active) {
- playSound("z#57.wav");
+ playSound(TRANSLATE("z#57.wav", "z#588.wav"));
loadFrame(0);
_active = false;
}
diff --git a/engines/titanic/game/replacement_ear.cpp b/engines/titanic/game/replacement_ear.cpp
index d1274e9..fff2092 100644
--- a/engines/titanic/game/replacement_ear.cpp
+++ b/engines/titanic/game/replacement_ear.cpp
@@ -21,6 +21,7 @@
*/
#include "titanic/game/replacement_ear.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -41,7 +42,7 @@ void CReplacementEar::load(SimpleFile *file) {
bool CReplacementEar::VisibleMsg(CVisibleMsg *msg) {
setVisible(true);
playMovie(MOVIE_WAIT_FOR_FINISH);
- playSound("z#64.wav");
+ playSound(TRANSLATE("z#64.wav", "z#595.wav"));
return true;
}
diff --git a/engines/titanic/game/sgt/drawer.cpp b/engines/titanic/game/sgt/drawer.cpp
index 7288bbd..9c7736a 100644
--- a/engines/titanic/game/sgt/drawer.cpp
+++ b/engines/titanic/game/sgt/drawer.cpp
@@ -21,6 +21,7 @@
*/
#include "titanic/game/sgt/drawer.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -54,7 +55,7 @@ bool CDrawer::TurnOn(CTurnOn *msg) {
setVisible(true);
_statics->_drawer = "Open";
playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
- playSound("b#10.wav");
+ playSound(TRANSLATE("b#10.wav", "b#95.wav"));
}
return true;
@@ -67,7 +68,7 @@ bool CDrawer::TurnOff(CTurnOff *msg) {
_endFrame = 100;
_isClosed = true;
playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
- playSound("b#10.wav");
+ playSound(TRANSLATE("b#10.wav", "b#95.wav"));
}
return true;
diff --git a/engines/titanic/gfx/music_slider_pitch.cpp b/engines/titanic/gfx/music_slider_pitch.cpp
index 49d53f7..48dee03 100644
--- a/engines/titanic/gfx/music_slider_pitch.cpp
+++ b/engines/titanic/gfx/music_slider_pitch.cpp
@@ -21,6 +21,7 @@
*/
#include "titanic/gfx/music_slider_pitch.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -48,7 +49,7 @@ bool CMusicSliderPitch::MusicSettingChangedMsg(CMusicSettingChangedMsg *msg) {
loadFrame(3 - _controlVal);
playSound("z#54.wav", 50);
} else {
- playSound("z#46.wav");
+ playSound(TRANSLATE("z#46.wav", "z#577.wav"));
}
return true;
diff --git a/engines/titanic/gfx/music_slider_speed.cpp b/engines/titanic/gfx/music_slider_speed.cpp
index bc04906..50f98cc 100644
--- a/engines/titanic/gfx/music_slider_speed.cpp
+++ b/engines/titanic/gfx/music_slider_speed.cpp
@@ -21,6 +21,7 @@
*/
#include "titanic/gfx/music_slider_speed.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -46,9 +47,9 @@ bool CMusicSliderSpeed::MusicSettingChangedMsg(CMusicSettingChangedMsg *msg) {
_controlVal = 0;
loadFrame(3 - _controlVal);
- playSound("z#54.wav", 50);
+ playSound(TRANSLATE("z#54.wav", "z#585.wav"), 50);
} else {
- playSound("z#46.wav");
+ playSound(TRANSLATE("z#46.wav", "z#577.wav"));
}
return true;
diff --git a/engines/titanic/gfx/music_switch_inversion.cpp b/engines/titanic/gfx/music_switch_inversion.cpp
index b6aa1be..9f55468 100644
--- a/engines/titanic/gfx/music_switch_inversion.cpp
+++ b/engines/titanic/gfx/music_switch_inversion.cpp
@@ -21,6 +21,7 @@
*/
#include "titanic/gfx/music_switch_inversion.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -46,9 +47,9 @@ bool CMusicSwitchInversion::MusicSettingChangedMsg(CMusicSettingChangedMsg *msg)
_controlVal = 0;
loadFrame(_controlVal);
- playSound("z#59.wav", 50);
+ playSound(TRANSLATE("z#59.wav", "z#590.wav"), 50);
} else {
- playSound("z#46.wav");
+ playSound(TRANSLATE("z#46.wav", "z#577.wav"));
}
return true;
diff --git a/engines/titanic/gfx/music_switch_reverse.cpp b/engines/titanic/gfx/music_switch_reverse.cpp
index 674119d..56d4f13 100644
--- a/engines/titanic/gfx/music_switch_reverse.cpp
+++ b/engines/titanic/gfx/music_switch_reverse.cpp
@@ -21,6 +21,7 @@
*/
#include "titanic/gfx/music_switch_reverse.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -46,9 +47,9 @@ bool CMusicSwitchReverse::MusicSettingChangedMsg(CMusicSettingChangedMsg *msg) {
_controlVal = 0;
loadFrame(_controlVal);
- playSound("z#59.wav", 50);
+ playSound(TRANSLATE("z#59.wav", "z#590.wav"), 50);
} else {
- playSound("z#46.wav");
+ playSound(TRANSLATE("z#46.wav", "z#577.wav"));
}
return true;
diff --git a/engines/titanic/gfx/music_voice_mute.cpp b/engines/titanic/gfx/music_voice_mute.cpp
index 034cb4f..075cd67 100644
--- a/engines/titanic/gfx/music_voice_mute.cpp
+++ b/engines/titanic/gfx/music_voice_mute.cpp
@@ -22,6 +22,7 @@
#include "titanic/gfx/music_voice_mute.h"
#include "titanic/sound/music_room.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -38,7 +39,7 @@ bool CMusicVoiceMute::MusicSettingChangedMsg(CMusicSettingChangedMsg *msg) {
CMusicRoom *musicRoom = getMusicRoom();
musicRoom->setMuteControl(_controlArea, _controlVal == 1 ? 1 : 0);
loadFrame(1 - _controlVal);
- playSound("z#55.wav", 50);
+ playSound(TRANSLATE("z#55.wav", "z#586.wav"), 50);
return true;
}
diff --git a/engines/titanic/moves/exit_bridge.cpp b/engines/titanic/moves/exit_bridge.cpp
index 6b69b88..973670a 100644
--- a/engines/titanic/moves/exit_bridge.cpp
+++ b/engines/titanic/moves/exit_bridge.cpp
@@ -21,6 +21,7 @@
*/
#include "titanic/moves/exit_bridge.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -48,7 +49,7 @@ void CExitBridge::load(SimpleFile *file) {
bool CExitBridge::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
if (getGameManager()) {
changeView(_destination);
- playSound("a#53.wav");
+ playSound(TRANSLATE("a#53.wav", "a#46.wav"));
changeView(_viewName);
}
diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp
index d1bf662..5512468 100644
--- a/engines/titanic/npcs/doorbot.cpp
+++ b/engines/titanic/npcs/doorbot.cpp
@@ -163,27 +163,32 @@ bool CDoorbot::MovieEndMsg(CMovieEndMsg *msg) {
}
bool CDoorbot::OnSummonBotMsg(COnSummonBotMsg *msg) {
- const char *const ROOM_WAVES[8][2] = {
- { "EmbLobby", "z#186.wav" },
- { "PromenadeDeck", "z#184.wav" },
- { "Arboretum", "z#188.wav" },
- { "Frozen Arboretum", "z#188.wav" },
- { "Bar", "z#187.wav" },
- { "MusicRoom", "z#185.wav" },
- { "MusicRoomLobby", "z#185.wav" },
- { "1stClassRestaurant", "z#183.wav" },
+ struct RoomWave {
+ const char *_room;
+ const char *_enSound;
+ const char *_deSound;
+ };
+ const RoomWave ROOM_WAVES[8] = {
+ { "EmbLobby", "z#186.wav", "z#716.wav" },
+ { "PromenadeDeck", "z#184.wav", "z#714.wav" },
+ { "Arboretum", "z#188.wav", "z#718.wav" },
+ { "Frozen Arboretum", "z#188.wav", "z#718.wav" },
+ { "Bar", "z#187.wav", "z#717.wav" },
+ { "MusicRoom", "z#185.wav", "z#715.wav" },
+ { "MusicRoomLobby", "z#185.wav", "z#715.wav" },
+ { "1stClassRestaurant", "z#183.wav", "z#713.wav" },
};
if (msg->_value != -1) {
int idx;
for (idx = 0; idx < 8; ++idx) {
- if (compareRoomNameTo(ROOM_WAVES[idx][0])) {
- playSound(ROOM_WAVES[idx][1]);
+ if (compareRoomNameTo(ROOM_WAVES[idx]._room)) {
+ playSound(TRANSLATE(ROOM_WAVES[idx]._enSound, ROOM_WAVES[idx]._deSound));
break;
}
}
if (idx == 8)
- playSound("z#146.wav");
+ playSound(TRANSLATE("z#146.wav", "z#702.wav"));
sleep(2000);
}
diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index 9da3ed0..ba07d1d1 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -25,6 +25,7 @@
#include "titanic/carry/carry.h"
#include "titanic/carry/chicken.h"
#include "titanic/game_manager.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -386,7 +387,7 @@ bool CParrot::ParrotSpeakMsg(CParrotSpeakMsg *msg) {
if ((getTicksCount() - _lastSpeakTime) < 20000 || _speechCounter)
return true;
- playSound("z#475.wav", 50);
+ playSound(TRANSLATE("z#475.wav", "z#212.wav"), 50);
if (msg->_target == "Bomb") {
startTalking("PerchedParrot", 280236);
diff --git a/engines/titanic/npcs/parrot_succubus.cpp b/engines/titanic/npcs/parrot_succubus.cpp
index 964b91b..64611e8 100644
--- a/engines/titanic/npcs/parrot_succubus.cpp
+++ b/engines/titanic/npcs/parrot_succubus.cpp
@@ -23,6 +23,7 @@
#include "titanic/npcs/parrot_succubus.h"
#include "titanic/pet_control/pet_control.h"
#include "titanic/carry/hose.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -79,7 +80,7 @@ bool CParrotSuccUBus::HoseConnectedMsg(CHoseConnectedMsg *msg) {
_isOn = false;
} else {
playMovie(_onStartFrame, _onEndFrame, 0);
- playSound("z#26.wav");
+ playSound(TRANSLATE("z#26.wav", "z#557.wav"));
}
playMovie(_hoseStartFrame, _hoseEndFrame, MOVIE_NOTIFY_OBJECT);
@@ -117,7 +118,7 @@ bool CParrotSuccUBus::EnterViewMsg(CEnterViewMsg *msg) {
bool CParrotSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
if (msg->_endFrame == _hoseEndFrame) {
playMovie(_pumpingStartFrame, _pumpingEndFrame, MOVIE_REPEAT);
- _pumpingSound = playSound("z#472.wav");
+ _pumpingSound = playSound(TRANSLATE("z#472.wav", "z#209.wav"));
return true;
} else {
return CSuccUBus::MovieEndMsg(msg);
@@ -139,7 +140,7 @@ bool CParrotSuccUBus::LeaveNodeMsg(CLeaveNodeMsg *msg) {
if (_hoseConnected) {
getHiddenObject(_pumpingTarget);
if (CHose::_statics->_actionTarget.empty()) {
- playSound("z#51.wav");
+ playSound(TRANSLATE("z#51.wav", "z#582.wav"));
CHoseConnectedMsg hoseMsg;
hoseMsg._connected = false;
hoseMsg.execute(this);
More information about the Scummvm-git-logs
mailing list