[Scummvm-git-logs] scummvm master -> 37d0b401cb751ac2cb907ec2169ab1ef288c032d

dreammaster dreammaster at scummvm.org
Wed Sep 20 04:50:44 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:
37d0b401cb TITANIC: DE: Adding German translations


Commit: 37d0b401cb751ac2cb907ec2169ab1ef288c032d
    https://github.com/scummvm/scummvm/commit/37d0b401cb751ac2cb907ec2169ab1ef288c032d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-19T22:50:39-04:00

Commit Message:
TITANIC: DE: Adding German translations

Changed paths:
    engines/titanic/game/head_smash_lever.cpp
    engines/titanic/game/transport/pellerator.cpp
    engines/titanic/moves/enter_sec_class_state.cpp
    engines/titanic/moves/exit_pellerator.cpp


diff --git a/engines/titanic/game/head_smash_lever.cpp b/engines/titanic/game/head_smash_lever.cpp
index dabed26..87f48c5 100644
--- a/engines/titanic/game/head_smash_lever.cpp
+++ b/engines/titanic/game/head_smash_lever.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/game/head_smash_lever.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
@@ -55,14 +56,14 @@ void CHeadSmashLever::load(SimpleFile *file) {
 bool CHeadSmashLever::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 	if (_enabled) {
 		playMovie(0, 14, 0);
-		playSound("z#54.wav");
-		int soundHandle = playSound("z#45.wav");
-		queueSound("z#49.wav", soundHandle);
+		playSound(TRANSLATE("z#54.wav", "z#585.wav"));
+		int soundHandle = playSound(TRANSLATE("z#45.wav", "z#576.wav"));
+		queueSound(TRANSLATE("z#49.wav", "z#580.wav"), soundHandle);
 		_ticks = getTicksCount();
 		_fieldE4 = true;
 	} else {
 		playMovie(0);
-		playSound("z#56.wav");
+		playSound(TRANSLATE("z#56.wav", "z#587.wav"));
 	}
 
 	return true;
@@ -84,7 +85,7 @@ bool CHeadSmashLever::FrameMsg(CFrameMsg *msg) {
 		CActMsg actMsg2("PlayToEnd");
 		actMsg2.execute("SmashingStatue");
 
-		playSound("b#16.wav");
+		playSound(TRANSLATE("b#16.wav", "b#100.wav"));
 		_fieldE4 = false;
 	}
 
diff --git a/engines/titanic/game/transport/pellerator.cpp b/engines/titanic/game/transport/pellerator.cpp
index 4ef5314..9958226 100644
--- a/engines/titanic/game/transport/pellerator.cpp
+++ b/engines/titanic/game/transport/pellerator.cpp
@@ -22,15 +22,22 @@
 
 #include "titanic/game/transport/pellerator.h"
 #include "titanic/core/room_item.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
-static const char *const WAVE_NAMES[10] = {
+static const char *const WAVE_NAMES_EN[10] = {
 	"z#465.wav", "z#456.wav", "z#455.wav", "z#453.wav",
 	"z#452.wav", "NoStandingInFunnyWays", "z#450.wav",
 	"z#449.wav", "z#435.wav", "z#434.wav"
 };
 
+static const char *const WAVE_NAMES_DE[10] = {
+	"z#202.wav", "z#193.wav", "z#192.wav", "z#190.wav",
+	"z#189.wav", "NoStandingInFunnyWays", "z#187.wav",
+	"z#186.wav", "z#180.wav", "z#179.wav"
+};
+
 BEGIN_MESSAGE_MAP(CPellerator, CTransport)
 	ON_MESSAGE(StatusChangeMsg)
 	ON_MESSAGE(EnterRoomMsg)
@@ -62,7 +69,7 @@ void CPellerator::load(SimpleFile *file) {
 
 bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 	setVisible(true);
-	playGlobalSound("z#74.wav", VOL_QUIET, true, true, 0);
+	playGlobalSound(TRANSLATE("z#74.wav", "z#605.wav"), VOL_QUIET, true, true, 0);
 	int classNum = getPassengerClass();
 	int newDest = msg->_newStatus;
 
@@ -288,8 +295,11 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 
 bool CPellerator::EnterRoomMsg(CEnterRoomMsg *msg) {
 	if (isEquals("PelleratorObject")) {
+		if (g_language == Common::DE_DEU)
+			_soundHandle = queueSound("z#200.wav", _soundHandle);
+
 		for (int idx = 0; idx < 10; ++idx)
-			loadSound(WAVE_NAMES[idx]);
+			loadSound(TRANSLATE(WAVE_NAMES_EN[idx], WAVE_NAMES_DE[idx]));
 		addTimer(10000);
 	}
 
@@ -332,22 +342,22 @@ bool CPellerator::MovieEndMsg(CMovieEndMsg *msg) {
 
 	switch (_destination) {
 	case 0:
-		_soundHandle = queueSound("z#429.wav", _soundHandle);
+		_soundHandle = queueSound(TRANSLATE("z#429.wav", "z#174.wav"), _soundHandle);
 		break;
 	case 1:
-		_soundHandle = queueSound("z#430.wav", _soundHandle);
+		_soundHandle = queueSound(TRANSLATE("z#430.wav", "z#175.wav"), _soundHandle);
 		break;
 	case 2:
-		_soundHandle = queueSound("z#431.wav", _soundHandle);
+		_soundHandle = queueSound(TRANSLATE("z#431.wav", "z#176.wav"), _soundHandle);
 		break;
 	case 4:
-		_soundHandle = queueSound("z#428.wav", _soundHandle);
+		_soundHandle = queueSound(TRANSLATE("z#428.wav", "z#173.wav"), _soundHandle);
 		break;
 	case 5:
-		_soundHandle = queueSound("z#433.wav", _soundHandle);
+		_soundHandle = queueSound(TRANSLATE("z#433.wav", "z#178.wav"), _soundHandle);
 		break;
 	case 6:
-		_soundHandle = queueSound("z#432.wav", _soundHandle);
+		_soundHandle = queueSound(TRANSLATE("z#432.wav", "z#177.wav"), _soundHandle);
 		break;
 	default:
 		break;
@@ -358,7 +368,8 @@ bool CPellerator::MovieEndMsg(CMovieEndMsg *msg) {
 
 bool CPellerator::TimerMsg(CTimerMsg *msg) {
 	if (compareRoomNameTo("Pellerator")) {
-		_soundHandle = queueSound(WAVE_NAMES[getRandomNumber(9)], _soundHandle);
+		_soundHandle = queueSound(TRANSLATE(WAVE_NAMES_EN[getRandomNumber(9)],
+				WAVE_NAMES_DE[getRandomNumber(9)]), _soundHandle);
 		addTimer(20000 + getRandomNumber(10000));
 	}
 
diff --git a/engines/titanic/moves/enter_sec_class_state.cpp b/engines/titanic/moves/enter_sec_class_state.cpp
index b7209f8..1cb607b 100644
--- a/engines/titanic/moves/enter_sec_class_state.cpp
+++ b/engines/titanic/moves/enter_sec_class_state.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/moves/enter_sec_class_state.h"
 #include "titanic/pet_control/pet_control.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
@@ -49,7 +50,7 @@ void CEnterSecClassState::load(SimpleFile *file) {
 
 bool CEnterSecClassState::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 	if (getPassengerClass() > 2) {
-		playSound("b#105.wav");
+		playSound(TRANSLATE("b#105.wav", "b#84.wav"));
 		petDisplayMessage(1, CLASS_NOT_PERMITTED_IN_AREA);
 	} else if (!compareRoomNameTo("SecClassLittleLift") || _mode == 2)  {
 		CActMsg actMsg(getFullViewName().deleteRight(2) + ".S");
@@ -65,20 +66,20 @@ bool CEnterSecClassState::StatusChangeMsg(CStatusChangeMsg *msg) {
 
 	if (msg->_newStatus == _mode || (_mode == 2 && msg->_newStatus == 3)) {
 		if (_mode == 2) {
-			_soundHandle = queueSound("b#36.wav", _soundHandle);
+			_soundHandle = queueSound(TRANSLATE("b#36.wav", "b#15.wav"), _soundHandle);
 		} else {
-			_soundHandle = queueSound("b#31.wav", _soundHandle);
+			_soundHandle = queueSound(TRANSLATE("b#31.wav", "b#10.wav"), _soundHandle);
 		}
 		if (msg->_newStatus == 3)
 			msg->_newStatus = 2;
 	} else {
 		changeView("SecClassLittleLift.Node 1.N");
 		if (msg->_newStatus == 1) {
-			_soundHandle = queueSound("b#32.wav", _soundHandle);
+			_soundHandle = queueSound(TRANSLATE("b#32.wav", "b#11.wav"), _soundHandle);
 		} else if (msg->_newStatus == 2) {
-			_soundHandle = queueSound("b#25.wav", _soundHandle);
+			_soundHandle = queueSound(TRANSLATE("b#25.wav", "b#4.wav"), _soundHandle);
 		} else if (msg->_newStatus == 3) {
-			_soundHandle = queueSound("b#33.wav", _soundHandle);
+			_soundHandle = queueSound(TRANSLATE("b#33.wav", "b#12.wav"), _soundHandle);
 			msg->_newStatus = 2;
 		}
 	}
diff --git a/engines/titanic/moves/exit_pellerator.cpp b/engines/titanic/moves/exit_pellerator.cpp
index 3d1438a..045c0e5 100644
--- a/engines/titanic/moves/exit_pellerator.cpp
+++ b/engines/titanic/moves/exit_pellerator.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/moves/exit_pellerator.h"
 #include "titanic/game/transport/pellerator.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
@@ -66,13 +67,13 @@ bool CExitPellerator::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 		if (_statics->_v2 != 2) {
 			switch (getRandomNumber(2)) {
 			case 0:
-				CPellerator::_soundHandle = queueSound("z#457.wav", CPellerator::_soundHandle);
+				CPellerator::_soundHandle = queueSound(TRANSLATE("z#457.wav", "z#194.wav"), CPellerator::_soundHandle);
 				break;
 			case 1:
-				CPellerator::_soundHandle = queueSound("z#458.wav", CPellerator::_soundHandle);
+				CPellerator::_soundHandle = queueSound(TRANSLATE("z#458.wav", "z#195.wav"), CPellerator::_soundHandle);
 				break;
 			default:
-				CPellerator::_soundHandle = queueSound("z#464.wav", CPellerator::_soundHandle);
+				CPellerator::_soundHandle = queueSound(TRANSLATE("z#464.wav", "z#201.wav"), CPellerator::_soundHandle);
 				break;
 			}
 		}
@@ -95,20 +96,20 @@ bool CExitPellerator::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 			break;
 		default:
 			petDisplayMessage(2, EXIT_FROM_OTHER_SIDE);
-			CPellerator::_soundHandle = queueSound("z#438.wav", CPellerator::_soundHandle);
+			CPellerator::_soundHandle = queueSound(TRANSLATE("z#438.wav", "z#183.wav"), CPellerator::_soundHandle);
 
 		}
 	} else if (name == "ExitPellerator2") {
 		if (_statics->_v2 == 2) {
 			switch (getRandomNumber(2)) {
 			case 0:
-				CPellerator::_soundHandle = queueSound("z#457.wav", CPellerator::_soundHandle);
+				CPellerator::_soundHandle = queueSound(TRANSLATE("z#457.wav", "z#194.wav"), CPellerator::_soundHandle);
 				break;
 			case 1:
-				CPellerator::_soundHandle = queueSound("z#458.wav", CPellerator::_soundHandle);
+				CPellerator::_soundHandle = queueSound(TRANSLATE("z#458.wav", "z#195.wav"), CPellerator::_soundHandle);
 				break;
 			default:
-				CPellerator::_soundHandle = queueSound("z#464.wav", CPellerator::_soundHandle);
+				CPellerator::_soundHandle = queueSound(TRANSLATE("z#464.wav", "z#201.wav"), CPellerator::_soundHandle);
 				break;
 			}
 		}
@@ -117,7 +118,7 @@ bool CExitPellerator::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 			changeView("Bar.Node 1.N");
 		} else {
 			petDisplayMessage(2, EXIT_FROM_OTHER_SIDE);
-			CPellerator::_soundHandle = queueSound("z#438.wav", CPellerator::_soundHandle);
+			CPellerator::_soundHandle = queueSound(TRANSLATE("z#438.wav", "z#183.wav"), CPellerator::_soundHandle);
 		}
 	}
 





More information about the Scummvm-git-logs mailing list