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

[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:
a04f35b4df TITANIC: Change Titania to use speech sound type


Commit: a04f35b4dfc0eddb98c4269edefbf7019e866ed5
    https://github.com/scummvm/scummvm/commit/a04f35b4dfc0eddb98c4269edefbf7019e866ed5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-25T10:56:42-04:00

Commit Message:
TITANIC: Change Titania to use speech sound type

Changed paths:
    engines/titanic/moves/restricted_move.cpp
    engines/titanic/npcs/titania.cpp
    engines/titanic/sound/titania_speech.cpp


diff --git a/engines/titanic/moves/restricted_move.cpp b/engines/titanic/moves/restricted_move.cpp
index 92804d4..52ff280 100644
--- a/engines/titanic/moves/restricted_move.cpp
+++ b/engines/titanic/moves/restricted_move.cpp
@@ -57,7 +57,8 @@ bool CRestrictedMove::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 		playSound("a#17.wav");
 		petDisplayMessage(1, CHECK_IN_AT_RECEPTION);
 	} else if (compareViewNameTo("Titania.Node 1.S")) {
-		playSound("z#226.wav");
+		CProximity prox(Audio::Mixer::kSpeechSoundType);
+		playSound("z#226.wav", prox);
 		changeView(_destination);
 	}
 
diff --git a/engines/titanic/npcs/titania.cpp b/engines/titanic/npcs/titania.cpp
index e0ea4f1..2b6536f 100644
--- a/engines/titanic/npcs/titania.cpp
+++ b/engines/titanic/npcs/titania.cpp
@@ -175,7 +175,8 @@ bool CTitania::ActMsg(CActMsg *msg) {
 
 		if (_centralCore && _eye1 && _eye2 && _ear1 && _ear2 && _nose && _mouth
 				&& _speechCentre && _olfactoryCentre && _auditoryCentre) {
-			playSound("z#47.wav");
+			CProximity prox(Audio::Mixer::kSpeechSoundType);
+			playSound("z#47.wav", prox);
 
 			CActMsg actMsg("Woken");
 			actMsg.execute("MouthSlot");
diff --git a/engines/titanic/sound/titania_speech.cpp b/engines/titanic/sound/titania_speech.cpp
index 1adce7a..bd41845 100644
--- a/engines/titanic/sound/titania_speech.cpp
+++ b/engines/titanic/sound/titania_speech.cpp
@@ -54,6 +54,7 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) {
 	CActMsg actMsg;
 
 	if (msg->_action == "TitaniaSpeech") {
+		CProximity prox(Audio::Mixer::kSpeechSoundType);
 		switch (_actionNum) {
 		case 1:
 			movieSetAudioTiming(true);
@@ -79,7 +80,7 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) {
 			visibleMsg.execute("TitaniaStillControl");
 			loadSound("a#10.wav");
 			playMovie(585, 706, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
-			playSound("a#10.wav");
+			playSound("a#10.wav", prox);
 			break;
 
 		case 4:
@@ -87,7 +88,7 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) {
 			visibleMsg.execute("TitaniaStillControl");
 			loadSound("a#9.wav");
 			playMovie(707, 905, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
-			playSound("a#9.wav");
+			playSound("a#9.wav", prox);
 			break;
 
 		case 5:
@@ -95,7 +96,7 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) {
 			visibleMsg.execute("TitaniaStillControl");
 			loadSound("a#8.wav");
 			playMovie(906, 938, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
-			playSound("a#8.wav");
+			playSound("a#8.wav", prox);
 			break;
 
 		default:
@@ -122,8 +123,10 @@ bool CTitaniaSpeech::MovieEndMsg(CMovieEndMsg *msg) {
 
 bool CTitaniaSpeech::MovieFrameMsg(CMovieFrameMsg *msg) {
 	int frame = getMovieFrame();
-	if (!frame)
-		playSound("a#12.wav");
+	if (frame == 0) {
+		CProximity prox(Audio::Mixer::kSpeechSoundType);
+		playSound("a#12.wav", prox);
+	}
 
 	return true;
 }
@@ -138,7 +141,8 @@ bool CTitaniaSpeech::TimerMsg(CTimerMsg *msg) {
 		++_actionNum;
 		actMsg.execute(this);
 	} else if (msg->_action == "Para2") {
-		playSound("a#11.wav");
+		CProximity prox(Audio::Mixer::kSpeechSoundType);
+		playSound("a#11.wav", prox);
 	} else {
 		frameMsg._frameNumber = _backgroundFrame++;
 		frameMsg.execute("TitaniaStillControl");