TITANIC: Cleanup of movie flags

2 files changed, 31 insertions, 31 deletions

diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp
index a6f45bda98..8dfc55905a 100644
--- a/engines/titanic/game/transport/lift.cpp
+++ b/engines/titanic/game/transport/lift.cpp
@@ -120,20 +120,20 @@ bool CLift::StatusChangeMsg(CStatusChangeMsg *msg) {
 
 		if (oldClass == newClass) {
 			debugStr = CString::format("Same (%d-%d)", _startFrame, _endFrame);
-			playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
+			playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
 		} else if (oldClass == 1 && newClass == 2) {
 			debugStr = CString::format("1 to 2 (%d-108, 108-%d)", _startFrame, _endFrame);
-			playMovie(_startFrame, 108, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
-			playMovie(108, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
+			playMovie(_startFrame, 108, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
+			playMovie(108, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
 		} else if (oldClass == 1 && newClass == 3) {
 			debugStr = CString::format("1 to 3 (%d-108, 108-190, 190-%d)", _startFrame, _endFrame);
-			playMovie(_startFrame, 108, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
-			playMovie(108, 190, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
-			playMovie(190, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
+			playMovie(_startFrame, 108, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
+			playMovie(108, 190, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
+			playMovie(190, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
 		} else {
 			debugStr = CString::format("2 to 3 (%d-190, 190-%d)", _startFrame, _endFrame);
-			playMovie(_startFrame, 190, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
-			playMovie(190, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
+			playMovie(_startFrame, 190, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
+			playMovie(190, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
 		}
 	}
 
@@ -144,20 +144,20 @@ bool CLift::StatusChangeMsg(CStatusChangeMsg *msg) {
 
 		if (oldClass == newClass) {
 			debugStr = CString::format("Same (%d-%d)", _startFrame, _endFrame);
-			playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
+			playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
 		} else if (oldClass == 3 && newClass == 2) {
 			debugStr = CString::format("3 to 2 (%d-407, 407-%d)", _startFrame, _endFrame);
-			playMovie(_startFrame, 407, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
-			playMovie(407, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
+			playMovie(_startFrame, 407, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
+			playMovie(407, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
 		} else if (oldClass == 3 && newClass == 1) {
 			debugStr = CString::format("3 to 1 (%d-407, 407-489, 489-%d)", _startFrame, _endFrame);
-			playMovie(_startFrame, 407, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
-			playMovie(407, 489, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
-			playMovie(489, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
+			playMovie(_startFrame, 407, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
+			playMovie(407, 489, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
+			playMovie(489, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
 		} else {
 			debugStr = CString::format("2 to 1 (%d-489, 489-%d)", _startFrame, _endFrame);
-			playMovie(_startFrame, 489, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
-			playMovie(489, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
+			playMovie(_startFrame, 489, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
+			playMovie(489, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
 		}
 	}
 
diff --git a/engines/titanic/game/transport/pellerator.cpp b/engines/titanic/game/transport/pellerator.cpp
index 095202d176..0228f9bc8b 100644
--- a/engines/titanic/game/transport/pellerator.cpp
+++ b/engines/titanic/game/transport/pellerator.cpp
@@ -83,7 +83,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 					playMovie(315, 323, 0);
 					for (int idx = 0; idx < 3; ++idx)
 						playMovie(299, 304, 0);
-					playMovie(305, 313, MOVIE_GAMESTATE);
+					playMovie(305, 313, MOVIE_WAIT_FOR_FINISH);
 					break;
 
 				case 2:
@@ -95,7 +95,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 					playMovie(153, 197, 0);
 					for (int idx = 0; idx < 5; ++idx)
 						playMovie(253, 263, 0);
-					playMovie(290, 293, MOVIE_GAMESTATE);
+					playMovie(290, 293, MOVIE_WAIT_FOR_FINISH);
 					break;
 
 				case 4:
@@ -107,7 +107,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 						playMovie(253, 263, 0);
 					for (int idx = 0; idx < 7; ++idx)
 						playMovie(336, 341, 0);
-					playMovie(342, 348, MOVIE_GAMESTATE);
+					playMovie(342, 348, MOVIE_WAIT_FOR_FINISH);
 					break;
 
 				case 5:
@@ -130,7 +130,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 					playMovie(315, 323, 0);
 					for (int idx = 0; idx < 3; ++idx)
 						playMovie(299, 304, 0);
-					playMovie(305, 313, MOVIE_GAMESTATE);
+					playMovie(305, 313, MOVIE_WAIT_FOR_FINISH);
 					break;
 
 				case 2:
@@ -139,7 +139,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 						playMovie(299, 304, 0);
 					for (int idx = 0; idx < 15; ++idx)
 						playMovie(245, 255, 0);
-					playMovie(264, 267, MOVIE_GAMESTATE);
+					playMovie(264, 267, MOVIE_WAIT_FOR_FINISH);
 					++_destination;
 					break;
 
@@ -149,7 +149,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 						playMovie(245, 255, 0);
 					for (int idx = 0; idx < 7; ++idx)
 						playMovie(336, 341, 0);
-					playMovie(342, 348, MOVIE_GAMESTATE);
+					playMovie(342, 348, MOVIE_WAIT_FOR_FINISH);
 					break;
 
 				case 5:
@@ -160,7 +160,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 						playMovie(245, 255, 0);
 					for (int idx = 0; idx < 3; ++idx)
 						playMovie(299, 304, 0);
-					playMovie(305, 313, MOVIE_GAMESTATE);
+					playMovie(305, 313, MOVIE_WAIT_FOR_FINISH);
 					break;
 
 				default:
@@ -184,7 +184,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 					playMovie(351, 359, 0);
 					for (int idx = 0; idx < 3; ++idx)
 						playMovie(336, 341, 0);
-					playMovie(342, 348, MOVIE_GAMESTATE);
+					playMovie(342, 348, MOVIE_WAIT_FOR_FINISH);
 					break;
 
 				case 3:
@@ -196,7 +196,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 						playMovie(245, 255, 0);
 					for (int idx = 0; idx < 3; ++idx)
 						playMovie(336, 341, 0);
-					playMovie(342, 348, MOVIE_GAMESTATE);
+					playMovie(342, 348, MOVIE_WAIT_FOR_FINISH);
 					--_destination;
 					break;
 
@@ -209,7 +209,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 					playMovie(78, 149, 0);
 					for (int idx = 0; idx < 5; ++idx)
 						playMovie(245, 255, 0);
-					playMovie(264, 267, MOVIE_GAMESTATE);
+					playMovie(264, 267, MOVIE_WAIT_FOR_FINISH);
 					break;
 
 				case 5:
@@ -221,7 +221,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 					playMovie(78, 149, 0);
 					for (int idx = 0; idx < 3; ++idx)
 						playMovie(336, 341, 0);
-					playMovie(342, 348, MOVIE_GAMESTATE);
+					playMovie(342, 348, MOVIE_WAIT_FOR_FINISH);
 					break;
 
 				default:
@@ -236,7 +236,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 					playMovie(351, 359, 0);
 					for (int idx = 0; idx < 3; ++idx)
 						playMovie(336, 341, 0);
-					playMovie(342, 348, MOVIE_GAMESTATE);
+					playMovie(342, 348, MOVIE_WAIT_FOR_FINISH);
 					break;
 
 				case 3:
@@ -245,7 +245,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 						playMovie(253, 263, 0);
 					for (int idx = 0; idx < 3; ++idx)
 						playMovie(336, 341, 0);
-					playMovie(342, 348, MOVIE_GAMESTATE);
+					playMovie(342, 348, MOVIE_WAIT_FOR_FINISH);
 					--_destination;
 					break;
 
@@ -255,7 +255,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 						playMovie(299, 304, 0);
 					for (int idx = 0; idx < 15; ++idx)
 						playMovie(253, 263, 0);
-					playMovie(290, 293, MOVIE_GAMESTATE);
+					playMovie(290, 293, MOVIE_WAIT_FOR_FINISH);
 					break;
 
 				case 5:
@@ -266,7 +266,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 						playMovie(253, 263, 0);
 					for (int idx = 0; idx < 3; ++idx)
 						playMovie(336, 341, 0);
-					playMovie(342, 348, MOVIE_GAMESTATE);
+					playMovie(342, 348, MOVIE_WAIT_FOR_FINISH);
 					break;
 
 				default: