diff options
| author | Paul Gilbert | 2017-01-20 22:33:13 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-01-20 22:33:13 -0500 |
| commit | ab1e729d2ceb9f207be051d720d66f3ca03fc2ea (patch) | |
| tree | a50a16feb98322d76c0ec101216c819302fba61f /engines/titanic/npcs/doorbot.cpp | |
| parent | bc1ad72d7f6437575fadd3abfb2d6fbc3340dd16 (diff) | |
| download | scummvm-rg350-ab1e729d2ceb9f207be051d720d66f3ca03fc2ea.tar.gz scummvm-rg350-ab1e729d2ceb9f207be051d720d66f3ca03fc2ea.tar.bz2 scummvm-rg350-ab1e729d2ceb9f207be051d720d66f3ca03fc2ea.zip | |
TITANIC: NpcFlag enum is now completely named
Diffstat (limited to 'engines/titanic/npcs/doorbot.cpp')
| -rw-r--r-- | engines/titanic/npcs/doorbot.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp index 50c8df2a6d..79e3dafed4 100644 --- a/engines/titanic/npcs/doorbot.cpp +++ b/engines/titanic/npcs/doorbot.cpp @@ -122,7 +122,7 @@ bool CDoorbot::MovieEndMsg(CMovieEndMsg *msg) { CTrueTalkNPC::MovieEndMsg(msg); } else if (_npcFlags & NPCFLAG_MOVE_LEFT) { if (clipExistsByEnd("Cloak Off", msg->_endFrame)) { - _npcFlags = (_npcFlags & ~NPCFLAG_8) | NPCFLAG_START_IDLING; + _npcFlags = (_npcFlags & ~NPCFLAG_DOORBOT_IN_HOME) | NPCFLAG_START_IDLING; setTalking(this, false); startTalking(this, 221474); _npcFlags |= NPCFLAG_DOORBOT_INTRO; @@ -146,7 +146,7 @@ bool CDoorbot::MovieEndMsg(CMovieEndMsg *msg) { || clipExistsByEnd("Whizz Off Right", msg->_endFrame)) { CPutBotBackInHisBoxMsg boxMsg; boxMsg.execute(this); - if (_npcFlags & NPCFLAG_4000000) + if (_npcFlags & NPCFLAG_SUMMON_BELLBOT) startAnimTimer("SummonBellbot", 1500); } else { CTrueTalkNPC::MovieEndMsg(msg); @@ -199,7 +199,7 @@ bool CDoorbot::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) { break; case 4: - _npcFlags = (_npcFlags & ~NPCFLAG_IDLING) | NPCFLAG_4000000; + _npcFlags = (_npcFlags & ~NPCFLAG_IDLING) | NPCFLAG_SUMMON_BELLBOT; playClip("Whizz Off Left", MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); break; @@ -222,7 +222,7 @@ bool CDoorbot::DoorbotNeededInHomeMsg(CDoorbotNeededInHomeMsg *msg) { stopMovie(); playClip("Cloak Off", MOVIE_NOTIFY_OBJECT); - _npcFlags |= NPCFLAG_8; + _npcFlags |= NPCFLAG_DOORBOT_IN_HOME; return true; } @@ -320,7 +320,7 @@ bool CDoorbot::TimerMsg(CTimerMsg *msg) { botMsg.execute(room); } - _npcFlags &= ~NPCFLAG_4000000; + _npcFlags &= ~NPCFLAG_SUMMON_BELLBOT; } return true; |