[Scummvm-git-logs] scummvm master -> 566742d4456446d154a4a5813b4f11c9937577f7

dreammaster dreammaster at scummvm.org
Wed Nov 2 04:09:18 CET 2016


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:
566742d445 TITANIC: Cleanup calls to playMovie


Commit: 566742d4456446d154a4a5813b4f11c9937577f7
    https://github.com/scummvm/scummvm/commit/566742d4456446d154a4a5813b4f11c9937577f7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-01T23:09:12-04:00

Commit Message:
TITANIC: Cleanup calls to playMovie

Changed paths:
    engines/titanic/core/background.cpp
    engines/titanic/game/computer.cpp
    engines/titanic/pet_control/pet_inventory.cpp
    engines/titanic/pet_control/pet_inventory_glyphs.cpp



diff --git a/engines/titanic/core/background.cpp b/engines/titanic/core/background.cpp
index 733dfc1..792cd28 100644
--- 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
index 3077b46..9aa5db2 100644
--- 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
index be01146..c1eb075 100644
--- 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
index 03293eb..e6087b5 100644
--- a/engines/titanic/pet_control/pet_inventory_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_inventory_glyphs.cpp
@@ -295,7 +295,7 @@ void CPetInventoryGlyph::startBackgroundMovie() {
 	if (_owner) {
 		CPetInventory *section = dynamic_cast<CPetInventory *>(_owner->getOwner());
 		if (section)
-			section->playMovie(_background, 1);
+			section->playMovie(_background, MOVIE_REPEAT);
 	}
 }
 
@@ -303,7 +303,7 @@ void CPetInventoryGlyph::startForegroundMovie() {
 	if (_owner) {
 		CPetInventory *section = dynamic_cast<CPetInventory *>(_owner->getOwner());
 		if (section)
-			section->playMovie(_image, 1);
+			section->playMovie(_image, MOVIE_REPEAT);
 	}
 }
 
@@ -311,7 +311,7 @@ void CPetInventoryGlyph::stopMovie() {
 	if (_owner) {
 		CPetInventory *section = dynamic_cast<CPetInventory *>(_owner->getOwner());
 		if (section)
-			section->playMovie(nullptr, 1);
+			section->playMovie(nullptr, MOVIE_REPEAT);
 	}
 }
 





More information about the Scummvm-git-logs mailing list