libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 11:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Change Titania to use speech sound type

Browse Source
This commit is contained in:
Paul Gilbert 2017-06-25 10:56:42 -04:00
parent f16505b128
commit a04f35b4df
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/titanic/moves/restricted_move.cpp
View File

@ -57,7 +57,8 @@ bool CRestrictedMove::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
playSound("a#17.wav"); playSound("a#17.wav");
petDisplayMessage(1, CHECK_IN_AT_RECEPTION); petDisplayMessage(1, CHECK_IN_AT_RECEPTION);
} else if (compareViewNameTo("Titania.Node 1.S")) { } else if (compareViewNameTo("Titania.Node 1.S")) {
playSound("z#226.wav"); CProximity prox(Audio::Mixer::kSpeechSoundType);
playSound("z#226.wav", prox);
changeView(_destination); changeView(_destination);
} }

3
engines/titanic/npcs/titania.cpp
View File

@ -175,7 +175,8 @@ bool CTitania::ActMsg(CActMsg *msg) {
if (_centralCore && _eye1 && _eye2 && _ear1 && _ear2 && _nose && _mouth if (_centralCore && _eye1 && _eye2 && _ear1 && _ear2 && _nose && _mouth
&& _speechCentre && _olfactoryCentre && _auditoryCentre) { && _speechCentre && _olfactoryCentre && _auditoryCentre) {
playSound("z#47.wav"); CProximity prox(Audio::Mixer::kSpeechSoundType);
playSound("z#47.wav", prox);
CActMsg actMsg("Woken"); CActMsg actMsg("Woken");
actMsg.execute("MouthSlot"); actMsg.execute("MouthSlot");

16
engines/titanic/sound/titania_speech.cpp
View File

@ -54,6 +54,7 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) {
CActMsg actMsg; CActMsg actMsg;
if (msg->_action == "TitaniaSpeech") { if (msg->_action == "TitaniaSpeech") {
CProximity prox(Audio::Mixer::kSpeechSoundType);
switch (_actionNum) { switch (_actionNum) {
case 1: case 1:
movieSetAudioTiming(true); movieSetAudioTiming(true);
@ -79,7 +80,7 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) {
visibleMsg.execute("TitaniaStillControl"); visibleMsg.execute("TitaniaStillControl");
loadSound("a#10.wav"); loadSound("a#10.wav");
playMovie(585, 706, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); playMovie(585, 706, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
playSound("a#10.wav"); playSound("a#10.wav", prox);
break; break;
case 4: case 4:
@ -87,7 +88,7 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) {
visibleMsg.execute("TitaniaStillControl"); visibleMsg.execute("TitaniaStillControl");
loadSound("a#9.wav"); loadSound("a#9.wav");
playMovie(707, 905, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); playMovie(707, 905, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
playSound("a#9.wav"); playSound("a#9.wav", prox);
break; break;
case 5: case 5:
@ -95,7 +96,7 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) {
visibleMsg.execute("TitaniaStillControl"); visibleMsg.execute("TitaniaStillControl");
loadSound("a#8.wav"); loadSound("a#8.wav");
playMovie(906, 938, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); playMovie(906, 938, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
playSound("a#8.wav"); playSound("a#8.wav", prox);
break; break;
default: default:
@ -122,8 +123,10 @@ bool CTitaniaSpeech::MovieEndMsg(CMovieEndMsg *msg) {
bool CTitaniaSpeech::MovieFrameMsg(CMovieFrameMsg *msg) { bool CTitaniaSpeech::MovieFrameMsg(CMovieFrameMsg *msg) {
int frame = getMovieFrame(); int frame = getMovieFrame();
if (!frame) if (frame == 0) {
playSound("a#12.wav"); CProximity prox(Audio::Mixer::kSpeechSoundType);
playSound("a#12.wav", prox);
}
return true; return true;
} }
@ -138,7 +141,8 @@ bool CTitaniaSpeech::TimerMsg(CTimerMsg *msg) {
++_actionNum; ++_actionNum;
actMsg.execute(this); actMsg.execute(this);
} else if (msg->_action == "Para2") { } else if (msg->_action == "Para2") {
playSound("a#11.wav"); CProximity prox(Audio::Mixer::kSpeechSoundType);
playSound("a#11.wav", prox);
} else { } else {
frameMsg._frameNumber = _backgroundFrame++; frameMsg._frameNumber = _backgroundFrame++;
frameMsg.execute("TitaniaStillControl"); frameMsg.execute("TitaniaStillControl");