[Scummvm-git-logs] scummvm master -> 6ef5948a062fdaf9f8422501a64bee8f19dc7fcf

[dreammaster]

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:
6ef5948a06 TITANIC: German sound fixes for rest of prologue


Commit: 6ef5948a062fdaf9f8422501a64bee8f19dc7fcf
    https://github.com/scummvm/scummvm/commit/6ef5948a062fdaf9f8422501a64bee8f19dc7fcf
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-17T11:43:44-04:00

Commit Message:
TITANIC: German sound fixes for rest of prologue

Changed paths:
    engines/titanic/game/credits.cpp
    engines/titanic/game/credits_button.cpp
    engines/titanic/game/transport/service_elevator.cpp


diff --git a/engines/titanic/game/credits.cpp b/engines/titanic/game/credits.cpp
index 8333343..9fda8cf 100644
--- a/engines/titanic/game/credits.cpp
+++ b/engines/titanic/game/credits.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/game/credits.h"
+#include "titanic/titanic.h"
 
 namespace Titanic {
 
@@ -58,13 +59,13 @@ bool CCredits::SignalObject(CSignalObject *msg) {
 bool CCredits::TimerMsg(CTimerMsg *msg) {
 	stopGlobalSound(true, -1);
 	setVisible(true);
-	loadSound("a#16.wav");
-	loadSound("a#24.wav");
+	loadSound(TRANSLATE("a#16.wav", "a#11.wav"));
+	loadSound(TRANSLATE("a#24.wav", "a#19.wav"));
 
 	if (playCutscene(0, 18)) {
-		playGlobalSound("a#16.wav", VOL_NORMAL, false, false, 0);
+		playGlobalSound(TRANSLATE("a#16.wav", "a#11.wav"), VOL_NORMAL, false, false, 0);
 		if (playCutscene(19, 642)) {
-			playSound("a#24.wav");
+			playSound(TRANSLATE("a#24.wav", "a#19.wav"));
 			playCutscene(643, 750);
 		}
 	}
diff --git a/engines/titanic/game/credits_button.cpp b/engines/titanic/game/credits_button.cpp
index ee8f7bb..92815ec 100644
--- a/engines/titanic/game/credits_button.cpp
+++ b/engines/titanic/game/credits_button.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/game/credits_button.h"
+#include "titanic/titanic.h"
 
 namespace Titanic {
 
@@ -50,7 +51,7 @@ bool CCreditsButton::MouseButtonUpMsg(CMouseButtonUpMsg *msg) {
 
 bool CCreditsButton::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 	if (_fieldE0) {
-		playSound("a#20.wav");
+		playSound(TRANSLATE("a#20.wav", "a#15.wav"));
 		CSignalObject signalMsg;
 		signalMsg._numValue = 1;
 		signalMsg.execute("CreditsPlayer");
diff --git a/engines/titanic/game/transport/service_elevator.cpp b/engines/titanic/game/transport/service_elevator.cpp
index b6c164d..8784f0e 100644
--- a/engines/titanic/game/transport/service_elevator.cpp
+++ b/engines/titanic/game/transport/service_elevator.cpp
@@ -108,7 +108,7 @@ bool CServiceElevator::ServiceElevatorMsg(CServiceElevatorMsg *msg) {
 		if (!_string1.empty()) {
 			if (_string1 == "DeepSpace") {
 				disableMouse();
-				_soundHandle1 = playSound("z#413.wav", 50);
+				_soundHandle1 = playSound(TRANSLATE("z#413.wav", "z#157.wav"), 50);
 				_timerId = addTimer(1, 1000, 500);
 			} else {
 				changeView(_string1);
@@ -120,9 +120,9 @@ bool CServiceElevator::ServiceElevatorMsg(CServiceElevatorMsg *msg) {
 		// Reaching destination floor
 		_fieldF8 = false;
 		_fieldDC = _v3;
-		loadSound("z#423.wav");
+		loadSound(TRANSLATE("z#423.wav", "z#168.wav"));
 		stopSound(_soundHandle2);
-		_soundHandle2 = playSound("z#423.wav", 80);
+		_soundHandle2 = playSound(TRANSLATE("z#423.wav", "z#168.wav"), 80);
 
 		switch (_fieldDC) {
 		case 0:
@@ -133,12 +133,12 @@ bool CServiceElevator::ServiceElevatorMsg(CServiceElevatorMsg *msg) {
 
 		case 1:
 			_string1 = _v2 ? "BilgeRoomWith.Node 2.N" : "BilgeRoom.Node 1.N";
-			queueSound("z#421.wav", _soundHandle2, 50);
+			queueSound(TRANSLATE("z#421.wav", "z#165.wav"), _soundHandle2, 50);
 			break;
 
 		case 2:
 			_string1 = _v1 ?  "MoonEmbLobby.Node 1.NE" : "EmbLobby.Node 1.NE";
-			queueSound("z#411.wav", _soundHandle2, 50);
+			queueSound(TRANSLATE("z#411.wav", "z#155.wav"), _soundHandle2, 50);
 			break;
 
 		default: