diff options
author | Paul Gilbert | 2017-09-17 11:21:37 -0400 |
---|---|---|
committer | Paul Gilbert | 2017-09-17 11:21:37 -0400 |
commit | fe83d2b3f698039c563a572b62b0c182f7789e01 (patch) | |
tree | aeedc2386a04e72d660152ebce96da70ad31e719 /engines/titanic/npcs/doorbot.cpp | |
parent | e1a84e2be56f2fe0e3a5a97bf6c9da5510fcf063 (diff) | |
download | scummvm-rg350-fe83d2b3f698039c563a572b62b0c182f7789e01.tar.gz scummvm-rg350-fe83d2b3f698039c563a572b62b0c182f7789e01.tar.bz2 scummvm-rg350-fe83d2b3f698039c563a572b62b0c182f7789e01.zip |
TITANIC: Fixes for sounds and Doorbot during German prologue
Diffstat (limited to 'engines/titanic/npcs/doorbot.cpp')
-rw-r--r-- | engines/titanic/npcs/doorbot.cpp | 35 |
1 files changed, 18 insertions, 17 deletions
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; |