aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/sound/titania_speech.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/titanic/sound/titania_speech.cpp')
-rw-r--r--engines/titanic/sound/titania_speech.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/engines/titanic/sound/titania_speech.cpp b/engines/titanic/sound/titania_speech.cpp
index d0ff423342..1adce7a5ac 100644
--- a/engines/titanic/sound/titania_speech.cpp
+++ b/engines/titanic/sound/titania_speech.cpp
@@ -34,16 +34,16 @@ END_MESSAGE_MAP()
void CTitaniaSpeech::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
- file->writeNumberLine(_paraNum, indent);
- file->writeNumberLine(_frameNum, indent);
+ file->writeNumberLine(_actionNum, indent);
+ file->writeNumberLine(_backgroundFrame, indent);
CGameObject::save(file, indent);
}
void CTitaniaSpeech::load(SimpleFile *file) {
file->readNumber();
- _paraNum = file->readNumber();
- _frameNum = file->readNumber();
+ _actionNum = file->readNumber();
+ _backgroundFrame = file->readNumber();
CGameObject::load(file);
}
@@ -54,16 +54,16 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) {
CActMsg actMsg;
if (msg->_action == "TitaniaSpeech") {
- switch (_paraNum) {
- case 0:
+ switch (_actionNum) {
+ case 1:
movieSetAudioTiming(true);
loadSound("a#12.wav");
sleep(1000);
- playMovie(0, 187, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT);
+ playMovie(0, 187, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
movieEvent(0);
break;
- case 1:
+ case 2:
loadSound("a#11.wav");
addTimer(0);
startAnimTimer("Para2", 300);
@@ -74,34 +74,34 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) {
startAnimTimer("NextPara", 30000);
break;
- case 2:
+ case 3:
visibleMsg._visible = false;
visibleMsg.execute("TitaniaStillControl");
loadSound("a#10.wav");
- playMovie(585, 706, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT);
+ playMovie(585, 706, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
playSound("a#10.wav");
break;
- case 3:
+ case 4:
visibleMsg._visible = false;
visibleMsg.execute("TitaniaStillControl");
loadSound("a#9.wav");
- playMovie(707, 905, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT);
+ playMovie(707, 905, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
playSound("a#9.wav");
break;
- case 4:
+ case 5:
visibleMsg._visible = false;
visibleMsg.execute("TitaniaStillControl");
loadSound("a#8.wav");
- playMovie(906, 938, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT);
+ playMovie(906, 938, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT);
playSound("a#8.wav");
break;
default:
sleep(3000);
actMsg._action = "SleepTitania";
- actMsg.execute(this);
+ actMsg.execute("TitaniaControl");
}
}
@@ -109,10 +109,10 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) {
}
bool CTitaniaSpeech::MovieEndMsg(CMovieEndMsg *msg) {
- if (_paraNum == 5) {
+ if (_actionNum == 5) {
startAnimTimer("NextPara", 0);
} else {
- if (_paraNum != 1)
+ if (_actionNum != 1)
addTimer(0);
startAnimTimer("NextPara", 3000);
}
@@ -135,12 +135,12 @@ bool CTitaniaSpeech::TimerMsg(CTimerMsg *msg) {
if (msg->_action == "NextPara") {
visibleMsg.execute("TitaniaStillControl");
- ++_paraNum;
+ ++_actionNum;
actMsg.execute(this);
} else if (msg->_action == "Para2") {
playSound("a#11.wav");
} else {
- frameMsg._frameNumber = _frameNum;
+ frameMsg._frameNumber = _backgroundFrame++;
frameMsg.execute("TitaniaStillControl");
}