diff options
| author | Paul Gilbert | 2017-02-16 21:42:42 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-02-16 21:42:42 -0500 |
| commit | 314c795d21ce1e67f8b3a73179b8042bc2e64487 (patch) | |
| tree | 8e5e5bc2d55868a2dde195cbb0b1bfb142cab336 /engines/titanic/npcs/doorbot.cpp | |
| parent | d56e4e4584ccb7d0741118da0ffb61129c767bee (diff) | |
| download | scummvm-rg350-314c795d21ce1e67f8b3a73179b8042bc2e64487.tar.gz scummvm-rg350-314c795d21ce1e67f8b3a73179b8042bc2e64487.tar.bz2 scummvm-rg350-314c795d21ce1e67f8b3a73179b8042bc2e64487.zip | |
TITANIC: Cleanup of movie flags
Diffstat (limited to 'engines/titanic/npcs/doorbot.cpp')
| -rw-r--r-- | engines/titanic/npcs/doorbot.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp index ff518adccf..03d723a384 100644 --- a/engines/titanic/npcs/doorbot.cpp +++ b/engines/titanic/npcs/doorbot.cpp @@ -185,7 +185,7 @@ bool CDoorbot::OnSummonBotMsg(COnSummonBotMsg *msg) { } playClip(getRandomNumber(1) ? "Whizz On Left" : "Whizz On Right", - MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); movieEvent(); _npcFlags |= NPCFLAG_MOVE_END; @@ -200,7 +200,7 @@ bool CDoorbot::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) { case 4: _npcFlags = (_npcFlags & ~NPCFLAG_IDLING) | NPCFLAG_SUMMON_BELLBOT; - playClip("Whizz Off Left", MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playClip("Whizz Off Left", MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); break; case 28: { @@ -387,7 +387,7 @@ bool CDoorbot::PutBotBackInHisBoxMsg(CPutBotBackInHisBoxMsg *msg) { bool CDoorbot::DismissBotMsg(CDismissBotMsg *msg) { if (_npcFlags & NPCFLAG_MOVE_END) { playClip(getRandomNumber(1) ? "Whizz Off Left" : "Whizz Off Right", - MOVIE_STOP_PREVIOUS | MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + MOVIE_STOP_PREVIOUS | MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); movieEvent(); if (_npcFlags & NPCFLAG_START_IDLING) { |