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/bellbot.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/bellbot.cpp')
| -rw-r--r-- | engines/titanic/npcs/bellbot.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp index 26c9b13e40..378112039b 100644 --- a/engines/titanic/npcs/bellbot.cpp +++ b/engines/titanic/npcs/bellbot.cpp @@ -89,7 +89,7 @@ bool CBellBot::OnSummonBotMsg(COnSummonBotMsg *msg) { _npcFlags &= ~NPCFLAG_MOVE_LOOP; } - playClip("Walk On", MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playClip("Walk On", MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); movieEvent(); _npcFlags |= NPCFLAG_MOVING; @@ -141,7 +141,7 @@ bool CBellBot::Use(CUse *msg) { bool CBellBot::DismissBotMsg(CDismissBotMsg *msg) { if (_npcFlags & NPCFLAG_MOVING) { - playClip("Walk Off", MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playClip("Walk Off", MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); if (_npcFlags & NPCFLAG_START_IDLING) { _npcFlags &= ~NPCFLAG_START_IDLING; performAction(true); @@ -168,7 +168,7 @@ bool CBellBot::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) { case 5: _npcFlags &= ~NPCFLAG_MOVE_START; - playClip("Walk Off", MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playClip("Walk Off", MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); movieEvent(); break; |