diff options
| author | Paul Gilbert | 2017-01-20 19:36:42 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-01-20 19:36:42 -0500 |
| commit | 960342cb3742ae6904139cb6fe77d0dfb42f85de (patch) | |
| tree | a0cbfd4c20acce3d7591cc179c9df1a35e1e2cd5 /engines/titanic/npcs/bellbot.cpp | |
| parent | e8d45a17dc4fd5d1bd04ef06b0729f5256ec4129 (diff) | |
| download | scummvm-rg350-960342cb3742ae6904139cb6fe77d0dfb42f85de.tar.gz scummvm-rg350-960342cb3742ae6904139cb6fe77d0dfb42f85de.tar.bz2 scummvm-rg350-960342cb3742ae6904139cb6fe77d0dfb42f85de.zip | |
TITANIC: Renaming NPC flags
Diffstat (limited to 'engines/titanic/npcs/bellbot.cpp')
| -rw-r--r-- | engines/titanic/npcs/bellbot.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp index 7fc8bfa9fb..ff9f865773 100644 --- a/engines/titanic/npcs/bellbot.cpp +++ b/engines/titanic/npcs/bellbot.cpp @@ -91,13 +91,13 @@ bool CBellBot::OnSummonBotMsg(COnSummonBotMsg *msg) { playClip("Walk On", MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); movieEvent(); - _npcFlags |= NPCFLAG_10000; + _npcFlags |= NPCFLAG_MOVING; return true; } bool CBellBot::LeaveViewMsg(CLeaveViewMsg *msg) { - if (_npcFlags & NPCFLAG_10000) { + if (_npcFlags & NPCFLAG_MOVING) { performAction(1); _npcFlags &= ~NPCFLAG_START_IDLING; CDismissBotMsg dismissMsg; @@ -108,7 +108,7 @@ bool CBellBot::LeaveViewMsg(CLeaveViewMsg *msg) { } bool CBellBot::MovieEndMsg(CMovieEndMsg *msg) { - if (!(_npcFlags & NPCFLAG_10000)) { + if (!(_npcFlags & NPCFLAG_MOVING)) { CTrueTalkNPC::MovieEndMsg(msg); } else if (clipExistsByEnd("Walk On", msg->_endFrame)) { setPosition(Point(80, 10)); @@ -140,7 +140,7 @@ bool CBellBot::Use(CUse *msg) { } bool CBellBot::DismissBotMsg(CDismissBotMsg *msg) { - if (_npcFlags & NPCFLAG_10000) { + if (_npcFlags & NPCFLAG_MOVING) { playClip("Walk Off", MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); if (_npcFlags & NPCFLAG_START_IDLING) { _npcFlags &= ~NPCFLAG_START_IDLING; |