From fe83d2b3f698039c563a572b62b0c182f7789e01 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 17 Sep 2017 11:21:37 -0400 Subject: TITANIC: Fixes for sounds and Doorbot during German prologue --- engines/titanic/game/cdrom_tray.cpp | 9 +++--- engines/titanic/game/computer_screen.cpp | 2 +- .../titanic/game/transport/service_elevator.cpp | 20 +++++++------ engines/titanic/npcs/doorbot.cpp | 35 +++++++++++----------- 4 files changed, 35 insertions(+), 31 deletions(-) (limited to 'engines/titanic') diff --git a/engines/titanic/game/cdrom_tray.cpp b/engines/titanic/game/cdrom_tray.cpp index d6aa32c702..9d0904b511 100644 --- a/engines/titanic/game/cdrom_tray.cpp +++ b/engines/titanic/game/cdrom_tray.cpp @@ -23,6 +23,7 @@ #include "titanic/core/room_item.h" #include "titanic/game/cdrom_tray.h" #include "titanic/messages/messages.h" +#include "titanic/titanic.h" namespace Titanic { @@ -59,7 +60,7 @@ bool CCDROMTray::ActMsg(CActMsg *msg) { if (_insertedCD == "None") { // No CD in tray playMovie(55, 65, 0); - playSound("a#35.wav", 50, 0, 0); + playSound(TRANSLATE("a#35.wav", "a#30.wav"), 50, 0, 0); _isOpened = false; } else { // Ejecting tray with CD @@ -85,19 +86,19 @@ bool CCDROMTray::ActMsg(CActMsg *msg) { } else if (_insertedCD == "newSTCD") { // Opening tray with Starship Titanic CD playMovie(0, 10, 0); - playSound("a#34.wav", 50, 0, 0); + playSound(TRANSLATE("a#34.wav", "a#29.wav"), 50, 0, 0); _isOpened = true; } } else if (_isOpened) { if (msg->_action == "newCD1" || msg->_action == "newCD2") { // Standard CD dropped on CDROM Tray playMovie(33, 43, MOVIE_NOTIFY_OBJECT); - playSound("a#35.wav", 50, 0, 0); + playSound(TRANSLATE("a#35.wav", "a#30.wav"), 50, 0, 0); } else if (msg->_action == "newSTCD") { // Starship Titanic CD dropped on CDROM Tray disableMouse(); playMovie(11, 21, MOVIE_NOTIFY_OBJECT); - playSound("a#35.wav", 50, 0, 0); + playSound(TRANSLATE("a#35.wav", "a#30.wav"), 50, 0, 0); } else { return true; } diff --git a/engines/titanic/game/computer_screen.cpp b/engines/titanic/game/computer_screen.cpp index ad4c025136..ea61bc531d 100644 --- a/engines/titanic/game/computer_screen.cpp +++ b/engines/titanic/game/computer_screen.cpp @@ -140,7 +140,7 @@ bool CComputerScreen::TimerMsg(CTimerMsg *msg) { setSoundVolume(handle, 10, 2); playClip(392, 450); startTalking("Doorbot", 0x3611A); - sleep(8000); + sleep(TRANSLATE(8000, 7000)); playClip(450, 492); startTalking("Doorbot", 0x36121); diff --git a/engines/titanic/game/transport/service_elevator.cpp b/engines/titanic/game/transport/service_elevator.cpp index dbd4e5d74f..b6c164dc93 100644 --- a/engines/titanic/game/transport/service_elevator.cpp +++ b/engines/titanic/game/transport/service_elevator.cpp @@ -23,6 +23,7 @@ #include "titanic/game/transport/service_elevator.h" #include "titanic/core/room_item.h" #include "titanic/npcs/doorbot.h" +#include "titanic/titanic.h" namespace Titanic { @@ -169,7 +170,7 @@ bool CServiceElevator::TimerMsg(CTimerMsg *msg) { _fieldF8 = true; CServiceElevatorFloorChangeMsg changeMsg(_fieldDC, _v3); changeMsg.execute(getRoom(), nullptr, MSGFLAG_SCAN); - _soundHandle2 = playSound("z#424.wav"); + _soundHandle2 = playSound(TRANSLATE("z#424.wav", "z#169.wav")); if (doorbot) { CActMsg actMsg("DoorbotPlayerPressedTopButton"); @@ -209,21 +210,21 @@ bool CServiceElevator::ServiceElevatorFloorRequestMsg(CServiceElevatorFloorReque CDoorbot *doorbot = dynamic_cast(findRoom()->findByName("Doorbot")); if (doorbot && _v3 == 0) { - _soundHandle1 = playSound("z#415.wav", 50); + _soundHandle1 = playSound(TRANSLATE("z#415.wav", "z#159.wav"), 50); _timerId = addTimer(1, 1000, 500); } else if (doorbot && _v3 == 1) { - _soundHandle1 = playSound("z#417.wav", 50); + _soundHandle1 = playSound(TRANSLATE("z#417.wav", "z#161.wav"), 50); _timerId = addTimer(1, 1000, 500); } else if (_fieldDC == _v3) { switch (_v3) { case 0: - _soundHandle1 = playSound("z#415.wav", 50); + _soundHandle1 = playSound(TRANSLATE("z#415.wav", "z#159.wav"), 50); break; case 1: - _soundHandle1 = playSound("z#420.wav", 50); + _soundHandle1 = playSound(TRANSLATE("z#420.wav", "z#164.wav"), 50); break; case 2: - _soundHandle1 = playSound("z#410.wav", 50); + _soundHandle1 = playSound(TRANSLATE("z#410.wav", "z#154.wav"), 50); break; default: break; @@ -233,13 +234,14 @@ bool CServiceElevator::ServiceElevatorFloorRequestMsg(CServiceElevatorFloorReque } else { switch (_v3) { case 0: - _soundHandle1 = playSound("z#414.wav", 50); + _soundHandle1 = playSound(TRANSLATE("z#414.wav", "z#158.wav"), 50); break; case 1: - _soundHandle1 = playSound(_fieldDC ? "z#419.wav" : "z#418.wav", 50); + _soundHandle1 = playSound(_fieldDC ? TRANSLATE("z#419.wav", "z#163.wav") + : TRANSLATE("z#418.wav", "z#162.wav"), 50); break; case 2: - _soundHandle1 = playSound("z#409.wav", 50); + _soundHandle1 = playSound(TRANSLATE("z#409.wav", "z#153.wav"), 50); break; default: break; diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp index 8ee1e3220c..83074c4ecb 100644 --- a/engines/titanic/npcs/doorbot.cpp +++ b/engines/titanic/npcs/doorbot.cpp @@ -24,6 +24,7 @@ #include "titanic/core/room_item.h" #include "titanic/debugger.h" #include "titanic/pet_control/pet_control.h" +#include "titanic/titanic.h" namespace Titanic { @@ -424,27 +425,27 @@ bool CDoorbot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg) if (_npcFlags & NPCFLAG_DOORBOT_INTRO) { // Initial speech by Doorbot in - switch (msg->_dialogueId) { - case 10552: + switch (msg->_dialogueId - TRANSLATE(10552, 10563)) { + case 0: playClip("SE Try Buttons", MOVIE_NOTIFY_OBJECT); _introMovieNum = 9; break; - case 10553: + case 1: enableMouse(); break; - case 10557: + case 5: playClip("SE Move To Right", MOVIE_NOTIFY_OBJECT); _introMovieNum = 11; break; - case 10559: + case 7: stopAnimTimer(_timerId); _timerId = addTimer(0, 2500, 0); break; - case 10560: + case 8: petShow(); petSetArea(PET_CONVERSATION); petIncAreaLocks(); @@ -452,31 +453,31 @@ bool CDoorbot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg) _timerId = addTimer(1, 1000, 0); break; - case 10561: + case 9: enableMouse(); _introMovieNum = 1; stopAnimTimer(_timerId); _timerId = addTimer(2, 10000, 0); break; - case 10562: + case 10: if (_introMovieNum == 1) { stopAnimTimer(_timerId); _timerId = addTimer(2, getRandomNumber(5000) + 5000, 0); } break; - case 10563: - case 10564: + case 11: + case 12: disableMouse(); startTalking(this, 221480); break; - case 10565: + case 13: startTalking(this, 221481); break; - case 10566: + case 14: stopAnimTimer(_timerId); _timerId = 0; if (_field110 == 2) { @@ -487,7 +488,7 @@ bool CDoorbot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg) } break; - case 10567: { + case 15: { CActMsg actMsg("BecomeGettable"); actMsg.execute("Photograph"); enableMouse(); @@ -496,26 +497,26 @@ bool CDoorbot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg) break; } - case 10568: + case 16: // Start moving cursor to photograph mouseDisableControl(); mouseSetPosition(Point(600, 250), 2500); _timerId = addTimer(6, 2500, 0); break; - case 10569: + case 17: if (_field110 != 2) { stopAnimTimer(_timerId); _timerId = addTimer(5, 3000, 0); } break; - case 10570: + case 18: mouseSetPosition(Point(200, 430), 2500); _timerId = addTimer(7, 3000, 0); break; - case 10571: + case 19: playClip("Cloak On", MOVIE_NOTIFY_OBJECT); _introMovieNum = 6; break; -- cgit v1.2.3