aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game/television.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-04-10 15:39:20 -0400
committerPaul Gilbert2016-07-10 16:10:51 -0400
commit91336a86115f600e626c333441aa1369b435ab92 (patch)
tree78b9b7ebb30f8992c1dc621a6b5cb3e0592f7df7 /engines/titanic/game/television.cpp
parent8e5f7a9453deff3436fc937292a0ff825acd7454 (diff)
downloadscummvm-rg350-91336a86115f600e626c333441aa1369b435ab92.tar.gz
scummvm-rg350-91336a86115f600e626c333441aa1369b435ab92.tar.bz2
scummvm-rg350-91336a86115f600e626c333441aa1369b435ab92.zip
TITANIC: Implement playing a range of frames within movie
Diffstat (limited to 'engines/titanic/game/television.cpp')
-rw-r--r--engines/titanic/game/television.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/game/television.cpp b/engines/titanic/game/television.cpp
index 2ad84d3ff9..6e1f5ca54c 100644
--- a/engines/titanic/game/television.cpp
+++ b/engines/titanic/game/television.cpp
@@ -148,8 +148,8 @@ bool CTelevision::EnterViewMsg(CEnterViewMsg *msg) {
return true;
}
-static const int FRAMES1[9] = { 0, 0, 56, 112, 168, 224, 280, 336, 392 };
-static const int FRAMES2[8] = { 0, 55, 111, 167, 223, 279, 335, 391 };
+static const int START_FRAMES[9] = { 0, 0, 56, 112, 168, 224, 280, 336, 392 };
+static const int END_FRAMES[8] = { 0, 55, 111, 167, 223, 279, 335, 391 };
bool CTelevision::PETUpMsg(CPETUpMsg *msg) {
if (msg->_name == "Television" && _isOn) {
@@ -158,7 +158,7 @@ bool CTelevision::PETUpMsg(CPETUpMsg *msg) {
_fieldE0 = _fieldE0 % _fieldE4 + 1;
stopMovie();
- fn1(FRAMES1[_fieldE0], FRAMES2[_fieldE0], 4);
+ playMovie(START_FRAMES[_fieldE0], END_FRAMES[_fieldE0], 4);
}
return true;
@@ -173,7 +173,7 @@ bool CTelevision::PETDownMsg(CPETDownMsg *msg) {
_fieldE0 = _fieldE0 % _fieldE4 + 1;
stopMovie();
- fn1(FRAMES1[_fieldE0], FRAMES2[_fieldE0], 4);
+ playMovie(START_FRAMES[_fieldE0], END_FRAMES[_fieldE0], 4);
}
return true;
@@ -182,7 +182,7 @@ bool CTelevision::PETDownMsg(CPETDownMsg *msg) {
bool CTelevision::StatusChangeMsg(CStatusChangeMsg *msg) {
if (_isOn) {
stopMovie();
- changeStatus(0);
+ playMovie(0);
}
return true;
@@ -211,7 +211,7 @@ bool CTelevision::PETActivateMsg(CPETActivateMsg *msg) {
if (_isOn) {
setVisible(true);
- fn1(0, 55, 0);
+ playMovie(0, 55, 0);
_fieldE0 = 1;
} else {
stopMovie();