[Scummvm-git-logs] scummvm master -> 8f6649cfb13be47f9fadfe50d31a0c0f2b8a28d1

dreammaster dreammaster at scummvm.org
Fri Sep 22 02:27:23 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:
8f6649cfb1 TITANIC: DE: Add miscellaneous missed sound translations


Commit: 8f6649cfb13be47f9fadfe50d31a0c0f2b8a28d1
    https://github.com/scummvm/scummvm/commit/8f6649cfb13be47f9fadfe50d31a0c0f2b8a28d1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-21T20:27:18-04:00

Commit Message:
TITANIC: DE: Add miscellaneous missed sound translations

Changed paths:
    engines/titanic/game/cdrom_tray.cpp
    engines/titanic/game/computer.cpp
    engines/titanic/game/nose_holder.cpp
    engines/titanic/moves/restricted_move.cpp


diff --git a/engines/titanic/game/cdrom_tray.cpp b/engines/titanic/game/cdrom_tray.cpp
index 0215b58..f9daf17 100644
--- a/engines/titanic/game/cdrom_tray.cpp
+++ b/engines/titanic/game/cdrom_tray.cpp
@@ -76,12 +76,12 @@ bool CCDROMTray::ActMsg(CActMsg *msg) {
 		} else if (_insertedCD == "None") {
 			// Opening tray with no CD
 			playMovie(44, 54, 0);
-			playSound("a#34.wav", 50, 0, 0);
+			playSound(TRANSLATE("a#34.wav", "a#29.wav"), 50, 0, 0);
 			_isOpened = true;
 		} else if (_insertedCD == "newCD1" || _insertedCD == "newCD2") {
 			// Opening tray with standard CD
 			playMovie(22, 32, 0);
-			playSound("a#34.wav", 50, 0, 0);
+			playSound(TRANSLATE("a#34.wav", "a#29.wav"), 50, 0, 0);
 			_isOpened = true;
 		} else if (_insertedCD == "newSTCD") {
 			// Opening tray with Starship Titanic CD
diff --git a/engines/titanic/game/computer.cpp b/engines/titanic/game/computer.cpp
index 9aa5db2..a9ff1ce 100644
--- a/engines/titanic/game/computer.cpp
+++ b/engines/titanic/game/computer.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/game/computer.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
@@ -46,7 +47,7 @@ void CComputer::load(SimpleFile *file) {
 
 bool CComputer::ActMsg(CActMsg *msg) {
 	if (_state) {
-		playSound("a#35.wav");
+		playSound(TRANSLATE("a#35.wav", "a#30.wav"));
 		playMovie(32, 42, 0);
 
 		if (msg->_action == "CD1")
@@ -66,11 +67,11 @@ bool CComputer::ActMsg(CActMsg *msg) {
 bool CComputer::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 	if (_currentCD == "None") {
 		if (_state) {
-			playSound("a#35.wav");
+			playSound(TRANSLATE("a#35.wav", "a#30.wav"));
 			playMovie(11, 21, 0);
 			_state = 0;
 		} else {
-			playSound("a#34.wav");
+			playSound(TRANSLATE("a#34.wav", "a#29.wav"));
 			playMovie(0, 10, 0);
 			_state = 1;
 		}
@@ -81,7 +82,7 @@ bool CComputer::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 			actMsg.execute(_currentCD);
 			_currentCD = "None";
 		} else {
-			playSound("a#34.wav");
+			playSound(TRANSLATE("a#34.wav", "a#29.wav"));
 			playMovie(21, 31, 0);
 			_state = 1;
 		}
@@ -92,10 +93,10 @@ bool CComputer::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 
 bool CComputer::MovieEndMsg(CMovieEndMsg *msg) {
 	if (msg->_endFrame == 90) {
-		playSound("a#32.wav");
-		playSound("a#33.wav");
-		playSound("a#31.wav");
-		playSound("a#0.wav");
+		playSound(TRANSLATE("a#32.wav", "a#27.wav"));
+		playSound(TRANSLATE("a#33.wav", "a#28.wav"));
+		playSound(TRANSLATE("a#31.wav", "a#26.wav"));
+		playSound(TRANSLATE("a#0.wav", "a#52.wav"));
 
 		gotoView("Home.Node 4.E", "_TRACK,3,e-cu,4,E");
 	}
diff --git a/engines/titanic/game/nose_holder.cpp b/engines/titanic/game/nose_holder.cpp
index d00c7b3..be17d53 100644
--- a/engines/titanic/game/nose_holder.cpp
+++ b/engines/titanic/game/nose_holder.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/game/nose_holder.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
@@ -54,7 +55,7 @@ bool CNoseHolder::ActMsg(CActMsg *msg) {
 	if (msg->_action == "Sneeze" && !_itemName.empty() && _dropEnabled) {
 		CProximity prox;
 		prox._positioningMode = POSMODE_VECTOR;
-		playSound("z#35.wav", prox);
+		playSound(TRANSLATE("z#35.wav", "z#567.wav"), prox);
 
 		if (getView() == findView()) {
 			setVisible(true);
diff --git a/engines/titanic/moves/restricted_move.cpp b/engines/titanic/moves/restricted_move.cpp
index 52ff280..279380a 100644
--- a/engines/titanic/moves/restricted_move.cpp
+++ b/engines/titanic/moves/restricted_move.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/moves/restricted_move.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
@@ -54,11 +55,12 @@ bool CRestrictedMove::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 	} else if (classNum != UNCHECKED) {
 		petDisplayMessage(1, CLASS_NOT_ALLOWED_AT_DEST);
 	} else if (compareRoomNameTo("EmbLobby")) {
-		playSound("a#17.wav");
+		if (g_language != Common::DE_DEU)
+			playSound("a#17.wav");
 		petDisplayMessage(1, CHECK_IN_AT_RECEPTION);
 	} else if (compareViewNameTo("Titania.Node 1.S")) {
 		CProximity prox(Audio::Mixer::kSpeechSoundType);
-		playSound("z#226.wav", prox);
+		playSound(TRANSLATE("z#226.wav", "z#132.wav"), prox);
 		changeView(_destination);
 	}
 





More information about the Scummvm-git-logs mailing list