[Scummvm-git-logs] scummvm master -> 4a90553bf32c8537a6cccc5a9ab55ddb92f1f48c

[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:
4a90553bf3 TITANIC: Cleanup calls to playClip


Commit: 4a90553bf32c8537a6cccc5a9ab55ddb92f1f48c
    https://github.com/scummvm/scummvm/commit/4a90553bf32c8537a6cccc5a9ab55ddb92f1f48c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-01T23:03:51-04:00

Commit Message:
TITANIC: Cleanup calls to playClip

Changed paths:
    engines/titanic/carry/carry_parrot.cpp
    engines/titanic/npcs/bellbot.cpp
    engines/titanic/npcs/deskbot.cpp
    engines/titanic/npcs/doorbot.cpp
    engines/titanic/npcs/liftbot.cpp
    engines/titanic/npcs/parrot.cpp



diff --git a/engines/titanic/carry/carry_parrot.cpp b/engines/titanic/carry/carry_parrot.cpp
index 9e36ddb..ed86384 100644
--- a/engines/titanic/carry/carry_parrot.cpp
+++ b/engines/titanic/carry/carry_parrot.cpp
@@ -154,8 +154,8 @@ bool CCarryParrot::PassOnDragStartMsg(CPassOnDragStartMsg *msg) {
 		moveToView();
 		setPosition(Point(0, 0));
 		setVisible(true);
-		playClip("Pick Up", 2);
-		playClip("Flapping", 1);
+		playClip("Pick Up", MOVIE_STOP_PREVIOUS);
+		playClip("Flapping", MOVIE_REPEAT);
 
 		stopTimer(_timerId);
 		_timerId = addTimer(1000, 1000);
diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp
index dd21726..9f6f152 100644
--- a/engines/titanic/npcs/bellbot.cpp
+++ b/engines/titanic/npcs/bellbot.cpp
@@ -229,7 +229,7 @@ bool CBellBot::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) {
 	};
 
 	if (msg->_value2 == 2)
-		playClip("Mother Frame", 0);
+		playClip("Mother Frame");
 	else
 		msg->_names = NAMES;
 
diff --git a/engines/titanic/npcs/deskbot.cpp b/engines/titanic/npcs/deskbot.cpp
index d3f8d03..083ed79 100644
--- a/engines/titanic/npcs/deskbot.cpp
+++ b/engines/titanic/npcs/deskbot.cpp
@@ -170,7 +170,7 @@ bool CDeskbot::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) {
 		inc54();
 		lockMouse();
 		petSetArea(PET_CONVERSATION);
-		playClip("ReprogramPETInHand", 4);
+		playClip("ReprogramPETInHand", MOVIE_NOTIFY_OBJECT);
 		_npcFlags |= NPCFLAG_10000;
 		_classNum = msg->_param1;
 
@@ -301,7 +301,7 @@ bool CDeskbot::TurnOff(CTurnOff *msg) {
 		performAction(1, findView());
 
 		_npcFlags = (_npcFlags & ~(NPCFLAG_SPEAKING | NPCFLAG_IDLING | NPCFLAG_START_IDLING)) | NPCFLAG_40000;
-		playClip("Closing", 0x14);
+		playClip("Closing", MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT);
 	}
 
 	return true;
diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp
index a3d5a66..06edae2 100644
--- a/engines/titanic/npcs/doorbot.cpp
+++ b/engines/titanic/npcs/doorbot.cpp
@@ -272,9 +272,9 @@ bool CDoorbot::TimerMsg(CTimerMsg *msg) {
 			break;
 
 		case 3:
-			playClip("DoubleTake Start", 0);
-			playClip("DoubleTake End", 0);
-			playClip("DoubleTake Start", 0);
+			playClip("DoubleTake Start");
+			playClip("DoubleTake End");
+			playClip("DoubleTake Start");
 			playClip("DoubleTake End", MOVIE_NOTIFY_OBJECT);
 			_introMovieNum = 3;
 			break;
diff --git a/engines/titanic/npcs/liftbot.cpp b/engines/titanic/npcs/liftbot.cpp
index 64bc7c4..ae3d153 100644
--- a/engines/titanic/npcs/liftbot.cpp
+++ b/engines/titanic/npcs/liftbot.cpp
@@ -164,7 +164,7 @@ bool CLiftBot::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) {
 	};
 
 	if (msg->_value2 == 2)
-		playClip("At Rest", 0);
+		playClip("At Rest");
 	else
 		msg->_names = NAMES;
 	return true;
diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index 678cf76..9c88847 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -291,7 +291,7 @@ bool CParrot::MovieEndMsg(CMovieEndMsg *msg) {
 					return true;
 
 				} else if (clipExistsByEnd("Lean Over To Chicken", msg->_endFrame)) {
-					playClip("Eat Chicken", 0);
+					playClip("Eat Chicken");
 					playClip("Eat Chicken 2", MOVIE_NOTIFY_OBJECT);
 					_v1 = 1;