[Scummvm-git-logs] scummvm master -> ab1e729d2ceb9f207be051d720d66f3ca03fc2ea

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ab1e729d2c TITANIC: NpcFlag enum is now completely named


Commit: ab1e729d2ceb9f207be051d720d66f3ca03fc2ea
    https://github.com/scummvm/scummvm/commit/ab1e729d2ceb9f207be051d720d66f3ca03fc2ea
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-20T22:33:13-05:00

Commit Message:
TITANIC: NpcFlag enum is now completely named

Changed paths:
    engines/titanic/npcs/doorbot.cpp
    engines/titanic/npcs/true_talk_npc.cpp
    engines/titanic/npcs/true_talk_npc.h


diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp
index 50c8df2..79e3daf 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 8d08600..768ce46 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 6cf6774..03a4634 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;