[Scummvm-git-logs] scummvm master -> a7479b4f5beb83e75379f868d5c19c23625eabe6

dreammaster dreammaster at scummvm.org
Wed Sep 20 12:43:24 CEST 2017


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7a184f0e7f TITANIC: DE: Add translations for loadSound calls
a7479b4f5b TITANIC: DE: Add translations for playGlobalSound calls


Commit: 7a184f0e7fa0af7eca0518af6b46be09fcf25bdc
    https://github.com/scummvm/scummvm/commit/7a184f0e7fa0af7eca0518af6b46be09fcf25bdc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-20T06:28:34-04:00

Commit Message:
TITANIC: DE: Add translations for loadSound calls

Changed paths:
    engines/titanic/game/end_credits.cpp
    engines/titanic/game/end_explode_ship.cpp
    engines/titanic/game/sweet_bowl.cpp
    engines/titanic/game/transport/lift.cpp
    engines/titanic/sound/seasonal_music_player.cpp


diff --git a/engines/titanic/game/end_credits.cpp b/engines/titanic/game/end_credits.cpp
index 77abfb0..4ea54a3 100644
--- a/engines/titanic/game/end_credits.cpp
+++ b/engines/titanic/game/end_credits.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/game/end_credits.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
@@ -47,8 +48,8 @@ bool CEndCredits::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 		stopGlobalSound(true, -1);
 		_flag = false;
 	} else {
-		loadSound("z#41.wav");
-		playGlobalSound("z#41.wav", VOL_NORMAL, false, false, 0);
+		loadSound(TRANSLATE("z#41.wav", "z#573.wav"));
+		playGlobalSound(TRANSLATE("z#41.wav", "z#573.wav"), VOL_NORMAL, false, false, 0);
 		_flag = true;
 	}
 
diff --git a/engines/titanic/game/end_explode_ship.cpp b/engines/titanic/game/end_explode_ship.cpp
index 2de9192..5f90604 100644
--- a/engines/titanic/game/end_explode_ship.cpp
+++ b/engines/titanic/game/end_explode_ship.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/game/end_explode_ship.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
@@ -53,9 +54,9 @@ bool CEndExplodeShip::ActMsg(CActMsg *msg) {
 	} else if (msg->_action == "Disarm Bomb") {
 		_isExploding = false;
 	} else if (msg->_action == "TakeOff") {
-		loadSound("a#31.wav");
-		loadSound("a#14.wav");
-		playGlobalSound("a#13.wav", VOL_NORMAL, true, true, 0);
+		loadSound(TRANSLATE("a#31.wav", "a#26.wav"));
+		loadSound(TRANSLATE("a#14.wav", "a#7.wav"));
+		playGlobalSound(TRANSLATE("a#13.wav", "a#6.wav"), VOL_NORMAL, true, true, 0);
 		addTimer(1, 10212, 0);
 	}
 
@@ -86,7 +87,7 @@ bool CEndExplodeShip::TimerMsg(CTimerMsg *msg) {
 
 bool CEndExplodeShip::MovieEndMsg(CMovieEndMsg *msg) {
 	if (msg->_endFrame == 550) {
-		playSound("z#399.wav");
+		playSound(TRANSLATE("z#399.wav", "a#10.wav"));
 		startAnimTimer("Boom", 4200, 0);
 	} else {
 		addTimer(3, 8000, 0);
@@ -97,9 +98,9 @@ bool CEndExplodeShip::MovieEndMsg(CMovieEndMsg *msg) {
 
 bool CEndExplodeShip::MovieFrameMsg(CMovieFrameMsg *msg) {
 	if (msg->_frameNumber == 58)
-		playSound("a#31.wav", 70);
+		playSound(TRANSLATE("a#31.wav", "a#26.wav"), 70);
 	else if (msg->_frameNumber == 551)
-		playSound("a#14.wav");
+		playSound(TRANSLATE("a#14.wav", "a#7.wav"));
 
 	return true;
 }
diff --git a/engines/titanic/game/sweet_bowl.cpp b/engines/titanic/game/sweet_bowl.cpp
index a1d0dc2..81d9393 100644
--- a/engines/titanic/game/sweet_bowl.cpp
+++ b/engines/titanic/game/sweet_bowl.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/game/sweet_bowl.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
@@ -47,8 +48,8 @@ bool CSweetBowl::MovieEndMsg(CMovieEndMsg *msg) {
 
 bool CSweetBowl::EnterViewMsg(CEnterViewMsg *msg) {
 	setVisible(false);
-	loadSound("b#43.wav");
-	loadSound("b#42.wav");
+	loadSound(TRANSLATE("b#43.wav", "b#26.wav"));
+	loadSound(TRANSLATE("b#42.wav", "b#25.wav"));
 	return true;
 }
 
@@ -56,7 +57,9 @@ bool CSweetBowl::ActMsg(CActMsg *msg) {
 	if (msg->_action == "Jiggle") {
 		setVisible(true);
 		playMovie(MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
-		playSound(getRandomNumber(1) == 1 ? "b#42.wav" : "b#43.wav");
+		playSound(getRandomNumber(1) == 1 ? 
+			TRANSLATE("b#42.wav", "b#25.wav") :
+			TRANSLATE("b#43.wav", "b#26.wav"));
 	}
 
 	petDisplayMessage(isEquals("BowlNutsRustler") ?
diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp
index 614018f..568e5be 100644
--- a/engines/titanic/game/transport/lift.cpp
+++ b/engines/titanic/game/transport/lift.cpp
@@ -24,6 +24,7 @@
 #include "titanic/debugger.h"
 #include "titanic/moves/multi_move.h"
 #include "titanic/pet_control/pet_control.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
@@ -241,9 +242,9 @@ bool CLift::EnterRoomMsg(CEnterRoomMsg *msg) {
 		CPetControl *pet = getPetControl();
 		int floorNum = pet->getRoomsFloorNum();
 		int elevNum = pet->getRoomsElevatorNum();
-		loadSound("z#520.wav");
-		loadSound("z#519.wav");
-		loadSound("z#518.wav");
+		loadSound(TRANSLATE("z#520.wav", "z#259.wav"));
+		loadSound(TRANSLATE("z#519.wav", "z#258.wav"));
+		loadSound(TRANSLATE("z#518.wav", "z#257.wav"));
 
 		if (elevNum == 4 && _hasHead && !_hasCorrectHead) {
 			CVisibleMsg visibleMsg;
@@ -251,17 +252,17 @@ bool CLift::EnterRoomMsg(CEnterRoomMsg *msg) {
 		}
 
 		if (floorNum < 20) {
-			playGlobalSound("z#520.wav", VOL_QUIET, true, true, 0);
-			playGlobalSound("z#519.wav", VOL_MUTE, false, true, 1);
-			playGlobalSound("z#518.wav", VOL_MUTE, false, true, 2);
+			playGlobalSound(TRANSLATE("z#520.wav", "z#259.wav"), VOL_QUIET, true, true, 0);
+			playGlobalSound(TRANSLATE("z#519.wav", "z#258.wav"), VOL_MUTE, false, true, 1);
+			playGlobalSound(TRANSLATE("z#518.wav", "z#257.wav"), VOL_MUTE, false, true, 2);
 		} else if (floorNum < 28) {
-			playGlobalSound("z#520.wav", VOL_MUTE, false, true, 0);
-			playGlobalSound("z#519.wav", VOL_QUIET, true, true, 1);
-			playGlobalSound("z#518.wav", VOL_MUTE, false, true, 2);
+			playGlobalSound(TRANSLATE("z#520.wav", "z#259.wav"), VOL_MUTE, false, true, 0);
+			playGlobalSound(TRANSLATE("z#519.wav", "z#258.wav"), VOL_QUIET, true, true, 1);
+			playGlobalSound(TRANSLATE("z#518.wav", "z#257.wav"), VOL_MUTE, false, true, 2);
 		} else {
-			playGlobalSound("z#520.wav", VOL_MUTE, false, true, 0);
-			playGlobalSound("z#519.wav", VOL_MUTE, false, true, 1);
-			playGlobalSound("z#518.wav", VOL_QUIET, true, true, 2);
+			playGlobalSound(TRANSLATE("z#520.wav", "z#259.wav"), VOL_MUTE, false, true, 0);
+			playGlobalSound(TRANSLATE("z#519.wav", "z#258.wav"), VOL_MUTE, false, true, 1);
+			playGlobalSound(TRANSLATE("z#518.wav", "z#257.wav"), VOL_QUIET, true, true, 2);
 		}
 	}
 
diff --git a/engines/titanic/sound/seasonal_music_player.cpp b/engines/titanic/sound/seasonal_music_player.cpp
index 40bf709..637a002 100644
--- a/engines/titanic/sound/seasonal_music_player.cpp
+++ b/engines/titanic/sound/seasonal_music_player.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/sound/seasonal_music_player.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
@@ -119,14 +120,14 @@ bool CSeasonalMusicPlayer::ChangeMusicMsg(CChangeMusicMsg *msg) {
 
 	if (!_isRepeated && msg->_flags == 2) {
 		_isRepeated = true;
-		loadSound("c#64.wav");
-		loadSound("c#63.wav");
-		loadSound("c#65.wav");
-		loadSound("c#62.wav");
-		playGlobalSound("c#64.wav", _springMode, _isSpring, true, 0);
-		playGlobalSound("c#63.wav", _summerMode, _isSummer, true, 1);
-		playGlobalSound("c#65.wav", _autumnMode, _isAutumn, true, 2);
-		playGlobalSound("c#62.wav", _winterMode, _isWinter, true, 3);
+		loadSound(TRANSLATE("c#64.wav", "c#47.wav"));
+		loadSound(TRANSLATE("c#63.wav", "c#46.wav"));
+		loadSound(TRANSLATE("c#65.wav", "c#48.wav"));
+		loadSound(TRANSLATE("c#62.wav", "c#47.wav"));
+		playGlobalSound(TRANSLATE("c#64.wav", "c#47.wav"), _springMode, _isSpring, true, 0);
+		playGlobalSound(TRANSLATE("c#63.wav", "c#46.wav"), _summerMode, _isSummer, true, 1);
+		playGlobalSound(TRANSLATE("c#65.wav", "c#48.wav"), _autumnMode, _isAutumn, true, 2);
+		playGlobalSound(TRANSLATE("c#62.wav", "c#47.wav"), _winterMode, _isWinter, true, 3);
 	}
 
 	return true;


Commit: a7479b4f5beb83e75379f868d5c19c23625eabe6
    https://github.com/scummvm/scummvm/commit/a7479b4f5beb83e75379f868d5c19c23625eabe6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-20T06:43:10-04:00

Commit Message:
TITANIC: DE: Add translations for playGlobalSound calls

Changed paths:
    engines/titanic/game/end_credit_text.cpp
    engines/titanic/game/end_sequence_control.cpp


diff --git a/engines/titanic/game/end_credit_text.cpp b/engines/titanic/game/end_credit_text.cpp
index 9af1313..8809799 100644
--- a/engines/titanic/game/end_credit_text.cpp
+++ b/engines/titanic/game/end_credit_text.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/game/end_credit_text.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
@@ -43,7 +44,7 @@ void CEndCreditText::load(SimpleFile *file) {
 }
 
 bool CEndCreditText::ActMsg(CActMsg *msg) {
-	playGlobalSound("z#41.wav", VOL_NORMAL, false, false, 0);
+	playGlobalSound(TRANSLATE("z#41.wav", "z#573.wav"), VOL_NORMAL, false, false, 0);
 	createCredits();
 	_flag = true;
 	return true;
diff --git a/engines/titanic/game/end_sequence_control.cpp b/engines/titanic/game/end_sequence_control.cpp
index 7041874..e8bc04a 100644
--- a/engines/titanic/game/end_sequence_control.cpp
+++ b/engines/titanic/game/end_sequence_control.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/game/end_sequence_control.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
@@ -71,7 +72,7 @@ bool CEndSequenceControl::EnterRoomMsg(CEnterRoomMsg *msg) {
 	petHide();
 	disableMouse();
 	addTimer(1, 1000, 0);
-	playGlobalSound("a#15.wav", VOL_NORMAL, true, true, 0, Audio::Mixer::kSpeechSoundType);
+	playGlobalSound(TRANSLATE("a#15.wav", "a#8.wav"), VOL_NORMAL, true, true, 0, Audio::Mixer::kSpeechSoundType);
 	return true;
 }
 





More information about the Scummvm-git-logs mailing list