diff options
| author | Paul Gilbert | 2016-10-29 18:21:52 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-10-29 18:21:52 -0400 |
| commit | fae906b539895ebf6b03c9ccb6090b07efc38d38 (patch) | |
| tree | 31ed23567167a843002560969d74d48805e93444 /engines/titanic/npcs/true_talk_npc.cpp | |
| parent | 23d3d08a9128be11ca7ce134c4832453e7f89845 (diff) | |
| download | scummvm-rg350-fae906b539895ebf6b03c9ccb6090b07efc38d38.tar.gz scummvm-rg350-fae906b539895ebf6b03c9ccb6090b07efc38d38.tar.bz2 scummvm-rg350-fae906b539895ebf6b03c9ccb6090b07efc38d38.zip | |
TITANIC: Renaming NPCFLAG enum values for idling
Diffstat (limited to 'engines/titanic/npcs/true_talk_npc.cpp')
| -rw-r--r-- | engines/titanic/npcs/true_talk_npc.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/npcs/true_talk_npc.cpp b/engines/titanic/npcs/true_talk_npc.cpp index 15a70b1749..8d08600c9b 100644 --- a/engines/titanic/npcs/true_talk_npc.cpp +++ b/engines/titanic/npcs/true_talk_npc.cpp @@ -111,8 +111,8 @@ bool CTrueTalkNPC::TrueTalkNotifySpeechStartedMsg(CTrueTalkNotifySpeechStartedMs _speechDuration = msg->_speechDuration; _startTicks = getTicksCount(); - if (!hasActiveMovie() || (_npcFlags & NPCFLAG_2)) { - _npcFlags &= ~NPCFLAG_2; + if (!hasActiveMovie() || (_npcFlags & NPCFLAG_IDLING)) { + _npcFlags &= ~NPCFLAG_IDLING; stopMovie(); CNPCPlayTalkingAnimationMsg msg1(_speechDuration, 0, nullptr); @@ -145,8 +145,8 @@ bool CTrueTalkNPC::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *m } bool CTrueTalkNPC::MovieEndMsg(CMovieEndMsg *msg) { - if (_npcFlags & NPCFLAG_2) { - _npcFlags &= ~NPCFLAG_2; + if (_npcFlags & NPCFLAG_IDLING) { + _npcFlags &= ~NPCFLAG_IDLING; CNPCQueueIdleAnimMsg idleMsg; idleMsg.execute(this); return true; @@ -175,7 +175,7 @@ bool CTrueTalkNPC::NPCQueueIdleAnimMsg(CNPCQueueIdleAnimMsg *msg) { } bool CTrueTalkNPC::TimerMsg(CTimerMsg *msg) { - if (_npcFlags & NPCFLAG_4) { + if (_npcFlags & NPCFLAG_START_IDLING) { if (_speechCounter > 0) return false; @@ -186,7 +186,7 @@ bool CTrueTalkNPC::TimerMsg(CTimerMsg *msg) { animMsg.execute(this); } - _npcFlags &= ~NPCFLAG_2; + _npcFlags &= ~NPCFLAG_IDLING; } } |