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/deskbot.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/deskbot.cpp')
| -rw-r--r-- | engines/titanic/npcs/deskbot.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/npcs/deskbot.cpp b/engines/titanic/npcs/deskbot.cpp index 20dc3af39b..e822ae9ee1 100644 --- a/engines/titanic/npcs/deskbot.cpp +++ b/engines/titanic/npcs/deskbot.cpp @@ -113,7 +113,7 @@ bool CDeskbot::ActMsg(CActMsg *msg) { bool CDeskbot::MovieEndMsg(CMovieEndMsg *msg) { bool flag = false; - if (_npcFlags & NPCFLAG_10000) { + if (_npcFlags & NPCFLAG_MOVING) { if (_classNum) { petSetArea(PET_ROOMS); decTransitions(); @@ -122,7 +122,7 @@ bool CDeskbot::MovieEndMsg(CMovieEndMsg *msg) { _classNum = NO_CLASS; } - _npcFlags &= ~NPCFLAG_10000; + _npcFlags &= ~NPCFLAG_MOVING; flag = true; } @@ -135,14 +135,14 @@ bool CDeskbot::MovieEndMsg(CMovieEndMsg *msg) { turnOn.execute("EmbBellbotTrigger"); unlockMouse(); changeView("EmbLobby.Node 4.N", ""); - } else if (_npcFlags & NPCFLAG_100000) { + } else if (_npcFlags & NPCFLAG_MOVE_LEFT) { CTurnOn turnOn; turnOn.execute("EmbDoorBotTrigger"); unlockMouse(); changeView("EmbLobby.Node 4.N", ""); } - _npcFlags &= ~(NPCFLAG_80000 | NPCFLAG_100000); + _npcFlags &= ~(NPCFLAG_80000 | NPCFLAG_MOVE_LEFT); flag = true; } @@ -176,7 +176,7 @@ bool CDeskbot::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) { lockMouse(); petSetArea(PET_CONVERSATION); playClip("ReprogramPETInHand", MOVIE_NOTIFY_OBJECT); - _npcFlags |= NPCFLAG_10000; + _npcFlags |= NPCFLAG_MOVING; _classNum = (PassengerClass)msg->_param1; switch (_classNum) { @@ -289,7 +289,7 @@ bool CDeskbot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg) turnOff.execute(this); case 41686: - _npcFlags |= NPCFLAG_100000; + _npcFlags |= NPCFLAG_MOVE_LEFT; turnOff.execute(this); break; |