aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2017-01-20 22:33:13 -0500
committerPaul Gilbert2017-01-20 22:33:13 -0500
commitab1e729d2ceb9f207be051d720d66f3ca03fc2ea (patch)
treea50a16feb98322d76c0ec101216c819302fba61f
parentbc1ad72d7f6437575fadd3abfb2d6fbc3340dd16 (diff)
downloadscummvm-rg350-ab1e729d2ceb9f207be051d720d66f3ca03fc2ea.tar.gz
scummvm-rg350-ab1e729d2ceb9f207be051d720d66f3ca03fc2ea.tar.bz2
scummvm-rg350-ab1e729d2ceb9f207be051d720d66f3ca03fc2ea.zip
TITANIC: NpcFlag enum is now completely named
-rw-r--r--engines/titanic/npcs/doorbot.cpp10
-rw-r--r--engines/titanic/npcs/true_talk_npc.cpp4
-rw-r--r--engines/titanic/npcs/true_talk_npc.h4
3 files changed, 9 insertions, 9 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;
diff --git a/engines/titanic/npcs/true_talk_npc.cpp b/engines/titanic/npcs/true_talk_npc.cpp
index 8d08600c9b..768ce46338 100644
--- a/engines/titanic/npcs/true_talk_npc.cpp
+++ b/engines/titanic/npcs/true_talk_npc.cpp
@@ -102,7 +102,7 @@ bool CTrueTalkNPC::TrueTalkNotifySpeechStartedMsg(CTrueTalkNotifySpeechStartedMs
_npcFlags |= NPCFLAG_SPEAKING;
++_speechCounter;
- if (!(_npcFlags & NPCFLAG_8)) {
+ if (!(_npcFlags & NPCFLAG_DOORBOT_IN_HOME)) {
// Stop any previous animation
if (_speechTimerId)
stopAnimTimer(_speechTimerId);
@@ -134,7 +134,7 @@ bool CTrueTalkNPC::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *m
--_speechCounter;
_speechDuration = 0;
- if (!(_npcFlags & NPCFLAG_8)) {
+ if (!(_npcFlags & NPCFLAG_DOORBOT_IN_HOME)) {
CNPCPlayTalkingAnimationMsg msg1(0, 2, nullptr);
msg1.execute(this);
CNPCQueueIdleAnimMsg msg2;
diff --git a/engines/titanic/npcs/true_talk_npc.h b/engines/titanic/npcs/true_talk_npc.h
index 6cf677442b..03a463474d 100644
--- a/engines/titanic/npcs/true_talk_npc.h
+++ b/engines/titanic/npcs/true_talk_npc.h
@@ -31,12 +31,12 @@ namespace Titanic {
enum NpcFlag {
NPCFLAG_SPEAKING = 1, NPCFLAG_IDLING = 2, NPCFLAG_START_IDLING = 4,
- NPCFLAG_8 = 8, NPCFLAG_MOVING = 0x10000, NPCFLAG_MOVE_START = 0x20000,
+ NPCFLAG_DOORBOT_IN_HOME = 8, NPCFLAG_MOVING = 0x10000, NPCFLAG_MOVE_START = 0x20000,
NPCFLAG_MOVE_LOOP = 0x40000, NPCFLAG_MOVE_FINISH = 0x80000,
NPCFLAG_MOVE_LEFT = 0x100000, NPCFLAG_MOVE_RIGHT = 0x200000,
NPCFLAG_MOVE_END = 0x400000, NPCFLAG_PECKING = 0x800000,
NPCFLAG_CHICKEN_OUTSIDE_CAGE = 0x1000000, NPCFLAG_TAKE_OFF = 0x2000000,
- NPCFLAG_4000000 = 0x4000000, NPCFLAG_DOORBOT_INTRO = 0x8000000
+ NPCFLAG_SUMMON_BELLBOT = 0x4000000, NPCFLAG_DOORBOT_INTRO = 0x8000000
};
class CViewItem;