diff options
| author | Paul Gilbert | 2017-09-11 19:35:21 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-09-11 19:35:21 -0400 |
| commit | c8c83145a8dc90c8ea340b258999e32db56e40a0 (patch) | |
| tree | a30d6b5289fdac45d657ce22f272ff5b53ce95e2 /engines/titanic/sound | |
| parent | 5d419c2b58841b2bc56c40caebab5e38622dee88 (diff) | |
| download | scummvm-rg350-c8c83145a8dc90c8ea340b258999e32db56e40a0.tar.gz scummvm-rg350-c8c83145a8dc90c8ea340b258999e32db56e40a0.tar.bz2 scummvm-rg350-c8c83145a8dc90c8ea340b258999e32db56e40a0.zip | |
TITANIC: The hasAudioTiming code was just an isActive flag
Diffstat (limited to 'engines/titanic/sound')
| -rw-r--r-- | engines/titanic/sound/music_room_instrument.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/sound/titania_speech.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/sound/music_room_instrument.cpp b/engines/titanic/sound/music_room_instrument.cpp index b92329850b..15ac2cd192 100644 --- a/engines/titanic/sound/music_room_instrument.cpp +++ b/engines/titanic/sound/music_room_instrument.cpp @@ -115,7 +115,7 @@ void CMusicRoomInstrument::start() { case MV_BELLS: _gameObjects[0]->loadFrame(0); - _gameObjects[0]->movieSetAudioTiming(true); + _gameObjects[0]->movieSetPlaying(true); break; case MV_SNAKE: @@ -210,8 +210,8 @@ void CMusicRoomInstrument::update(int val) { case MV_BELLS: switch (val) { case 60: - _gameObjects[0]->movieSetAudioTiming(true); _gameObjects[0]->playMovie(0, 512, MOVIE_STOP_PREVIOUS); + _gameObjects[0]->movieSetPlaying(true); _animTime = 0.6; break; diff --git a/engines/titanic/sound/titania_speech.cpp b/engines/titanic/sound/titania_speech.cpp index bd41845712..c6365a828b 100644 --- a/engines/titanic/sound/titania_speech.cpp +++ b/engines/titanic/sound/titania_speech.cpp @@ -57,10 +57,10 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) { CProximity prox(Audio::Mixer::kSpeechSoundType); switch (_actionNum) { case 1: - movieSetAudioTiming(true); loadSound("a#12.wav"); sleep(1000); playMovie(0, 187, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); + movieSetPlaying(true); movieEvent(0); break; |