TITANIC: Cleanup calls to playMovie

scummvm · Nov 2, 2016 · 566742d · 566742d
1 parent 4a90553
commit 566742d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/engines/titanic/core/background.cpp b/engines/titanic/core/background.cpp
@@ -58,7 +58,7 @@ void CBackground::load(SimpleFile *file) {
 bool CBackground::StatusChangeMsg(CStatusChangeMsg *msg) {
 	setVisible(true);
 	if (_fieldDC) {
-		playMovie(_startFrame, _endFrame, 16);
+		playMovie(_startFrame, _endFrame, MOVIE_GAMESTATE);
 	} else {
 		playMovie(_startFrame, _endFrame, 0);
 	}

diff --git a/engines/titanic/game/computer.cpp b/engines/titanic/game/computer.cpp
@@ -54,7 +54,7 @@ bool CComputer::ActMsg(CActMsg *msg) {
 		else if (msg->_action == "CD2")
 			playMovie(50, 79, 0);
 		else if (msg->_action == "STCD")
-			playMovie(80, 90, 4);
+			playMovie(80, 90, MOVIE_NOTIFY_OBJECT);
 
 		_currentCD = msg->_action;
 		_state = 0;

diff --git a/engines/titanic/pet_control/pet_inventory.cpp b/engines/titanic/pet_control/pet_inventory.cpp
@@ -242,7 +242,7 @@ void CPetInventory::playMovie(CGameObject *movie, int flag) {
 
 	if (_movie) {
 		if (flag)
-			_movie->playMovie(0, 14, 1);
+			_movie->playMovie(0, 14, MOVIE_REPEAT);
 		else
 			_movie->playMovie(0);
 	}

diff --git a/engines/titanic/pet_control/pet_inventory_glyphs.cpp b/engines/titanic/pet_control/pet_inventory_glyphs.cpp
@@ -295,23 +295,23 @@ void CPetInventoryGlyph::startBackgroundMovie() {
 	if (_owner) {
 		CPetInventory *section = dynamic_cast<CPetInventory *>(_owner->getOwner());
 		if (section)
-			section->playMovie(_background, 1);
+			section->playMovie(_background, MOVIE_REPEAT);
 	}
 }
 
 void CPetInventoryGlyph::startForegroundMovie() {
 	if (_owner) {
 		CPetInventory *section = dynamic_cast<CPetInventory *>(_owner->getOwner());
 		if (section)
-			section->playMovie(_image, 1);
+			section->playMovie(_image, MOVIE_REPEAT);
 	}
 }
 
 void CPetInventoryGlyph::stopMovie() {
 	if (_owner) {
 		CPetInventory *section = dynamic_cast<CPetInventory *>(_owner->getOwner());
 		if (section)
-			section->playMovie(nullptr, 1);
+			section->playMovie(nullptr, MOVIE_REPEAT);
 	}
 }