[Scummvm-git-logs] scummvm master -> 9f2d7a67930722bb77e6efc1b741cc98c6397aa3

[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:
9f2d7a6793 TITANIA: DE: Fixes for Titania's wakeup speech


Commit: 9f2d7a67930722bb77e6efc1b741cc98c6397aa3
    https://github.com/scummvm/scummvm/commit/9f2d7a67930722bb77e6efc1b741cc98c6397aa3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-10-08T11:38:40-04:00

Commit Message:
TITANIA: DE: Fixes for Titania's wakeup speech

Changed paths:
    engines/titanic/sound/titania_speech.cpp


diff --git a/engines/titanic/sound/titania_speech.cpp b/engines/titanic/sound/titania_speech.cpp
index 30446fd..b227c39 100644
--- a/engines/titanic/sound/titania_speech.cpp
+++ b/engines/titanic/sound/titania_speech.cpp
@@ -60,9 +60,14 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) {
 		case 1:
 			loadSound(TRANSLATE("a#12.wav", "a#0.wav"));
 			sleep(1000);
-			playMovie(0, 187, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
-			movieSetPlaying(true);
-			movieEvent(0);
+			playMovie(TRANSLATE(0, 584), TRANSLATE(187, 761),
+				MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
+			if (g_language == Common::EN_ANY) {
+				movieSetPlaying(true);
+				movieEvent(0);
+			} else {
+				playSound("a#0.wav", prox);
+			}
 			break;
 
 		case 2:
@@ -73,14 +78,14 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) {
 			addTimer(12000);
 			addTimer(18000);
 			addTimer(24000);
-			startAnimTimer("NextPara", 30000);
+			startAnimTimer("NextPara", TRANSLATE(30000, 33000));
 			break;
 
 		case 3:
 			visibleMsg._visible = false;
 			visibleMsg.execute("TitaniaStillControl");
 			loadSound(TRANSLATE("a#10.wav", "a#2.wav"));
-			playMovie(585, 706, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
+			playMovie(585, TRANSLATE(706, 748), MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
 			playSound(TRANSLATE("a#10.wav", "a#2.wav"), prox);
 			break;
 
@@ -96,7 +101,7 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) {
 			visibleMsg._visible = false;
 			visibleMsg.execute("TitaniaStillControl");
 			loadSound(TRANSLATE("a#8.wav", "a#1.wav"));
-			playMovie(906, 938, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
+			playMovie(906, TRANSLATE(938, 943), MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
 			playSound(TRANSLATE("a#8.wav", "a#1.wav"), prox);
 			break;