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

dreammaster dreammaster at scummvm.org
Thu Jul 6 21:31:20 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:
e04815f932 TITANIC: Mark a few more sound playbacks as speech


Commit: e04815f932f38b16187052c62a52cd86b4091fb6
    https://github.com/scummvm/scummvm/commit/e04815f932f38b16187052c62a52cd86b4091fb6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-06T15:31:07-04:00

Commit Message:
TITANIC: Mark a few more sound playbacks as speech

Changed paths:
    engines/titanic/carry/carry_parrot.cpp
    engines/titanic/game/parrot/parrot_nut_eater.cpp


diff --git a/engines/titanic/carry/carry_parrot.cpp b/engines/titanic/carry/carry_parrot.cpp
index 429c62e..c874726 100644
--- a/engines/titanic/carry/carry_parrot.cpp
+++ b/engines/titanic/carry/carry_parrot.cpp
@@ -169,7 +169,8 @@ bool CCarryParrot::PassOnDragStartMsg(CPassOnDragStartMsg *msg) {
 		startTalking(npc, 0x446BF);
 
 	_canTake = false;
-	playSound("z#475.wav");
+	CProximity prox(Audio::Mixer::kSpeechSoundType);
+	playSound("z#475.wav", prox);
 	moveUnder(findRoom());
 	CParrot::_state = PARROT_ESCAPED;
 
diff --git a/engines/titanic/game/parrot/parrot_nut_eater.cpp b/engines/titanic/game/parrot/parrot_nut_eater.cpp
index 3068d54..c8d9446 100644
--- a/engines/titanic/game/parrot/parrot_nut_eater.cpp
+++ b/engines/titanic/game/parrot/parrot_nut_eater.cpp
@@ -81,12 +81,14 @@ bool CParrotNutEater::NutPuzzleMsg(CNutPuzzleMsg *msg) {
 }
 
 bool CParrotNutEater::MovieFrameMsg(CMovieFrameMsg *msg) {
+	CProximity prox(Audio::Mixer::kSpeechSoundType);
+
 	switch (msg->_frameNumber) {
 	case 68:
-		playSound("z#214.wav");
+		playSound("z#214.wav", prox);
 		break;
 	case 132:
-		playSound("z#216.wav");
+		playSound("z#216.wav", prox);
 		break;
 	default:
 		break;





More information about the Scummvm-git-logs mailing list