aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2016-11-01 23:09:12 -0400
committerPaul Gilbert2016-11-01 23:09:12 -0400
commit566742d4456446d154a4a5813b4f11c9937577f7 (patch)
tree937ca39baee0abb97813961c7e22d3854e9e7045
parent4a90553bf32c8537a6cccc5a9ab55ddb92f1f48c (diff)
downloadscummvm-rg350-566742d4456446d154a4a5813b4f11c9937577f7.tar.gz
scummvm-rg350-566742d4456446d154a4a5813b4f11c9937577f7.tar.bz2
scummvm-rg350-566742d4456446d154a4a5813b4f11c9937577f7.zip
TITANIC: Cleanup calls to playMovie
-rw-r--r--engines/titanic/core/background.cpp2
-rw-r--r--engines/titanic/game/computer.cpp2
-rw-r--r--engines/titanic/pet_control/pet_inventory.cpp2
-rw-r--r--engines/titanic/pet_control/pet_inventory_glyphs.cpp6
4 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/core/background.cpp b/engines/titanic/core/background.cpp
index 733dfc1cf3..792cd28346 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 3077b46178..9aa5db252c 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 be01146398..c1eb0754a2 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 03293eb453..e6087b5c02 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);
}
}