aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2017-09-11 19:35:21 -0400
committerPaul Gilbert2017-09-11 19:35:21 -0400
commitc8c83145a8dc90c8ea340b258999e32db56e40a0 (patch)
treea30d6b5289fdac45d657ce22f272ff5b53ce95e2 /engines/titanic/core
parent5d419c2b58841b2bc56c40caebab5e38622dee88 (diff)
downloadscummvm-rg350-c8c83145a8dc90c8ea340b258999e32db56e40a0.tar.gz
scummvm-rg350-c8c83145a8dc90c8ea340b258999e32db56e40a0.tar.bz2
scummvm-rg350-c8c83145a8dc90c8ea340b258999e32db56e40a0.zip
TITANIC: The hasAudioTiming code was just an isActive flag
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/game_object.cpp4
-rw-r--r--engines/titanic/core/game_object.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index ae517a2689..ef7a8c2bca 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -1374,14 +1374,14 @@ void CGameObject::setToggleColor(byte r, byte g, byte b) {
_toggleB = b;
}
-void CGameObject::movieSetAudioTiming(bool flag) {
+void CGameObject::movieSetPlaying(bool flag) {
if (!_surface && !_resource.empty()) {
loadResource(_resource);
_resource.clear();
}
if (_surface && _surface->_movie)
- _surface->_movie->_hasAudioTiming = flag;
+ _surface->_movie->setPlaying(flag);
}
void CGameObject::movieEvent(int frameNumber) {
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index f79c9e1d1e..b592806977 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -653,9 +653,9 @@ public:
void stopMovie();
/**
- * Overrides whether the object's movie has audio timing
+ * Overrides whether the object's movie is playing or paused
*/
- void movieSetAudioTiming(bool flag);
+ void movieSetPlaying(bool flag);
/**
* Get the current movie frame