aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk/myst_stacks/mechanical.cpp
diff options
context:
space:
mode:
authorBastien Bouclet2018-06-11 20:01:12 +0200
committerBastien Bouclet2018-06-13 08:00:29 +0200
commit2de359f23de43db2ab3e46f55c0bb5a880ea8441 (patch)
tree077da0f05a50cab73ff65607f6f8d94e81237328 /engines/mohawk/myst_stacks/mechanical.cpp
parent47ddd9c2144c236e2b3bc0dd0f8349ae8657efb7 (diff)
downloadscummvm-rg350-2de359f23de43db2ab3e46f55c0bb5a880ea8441.tar.gz
scummvm-rg350-2de359f23de43db2ab3e46f55c0bb5a880ea8441.tar.bz2
scummvm-rg350-2de359f23de43db2ab3e46f55c0bb5a880ea8441.zip
MOHAWK: MYST: Make the scripts time accounting pause safe
Diffstat (limited to 'engines/mohawk/myst_stacks/mechanical.cpp')
-rw-r--r--engines/mohawk/myst_stacks/mechanical.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/mohawk/myst_stacks/mechanical.cpp b/engines/mohawk/myst_stacks/mechanical.cpp
index 5c0e273913..2481ca66e7 100644
--- a/engines/mohawk/myst_stacks/mechanical.cpp
+++ b/engines/mohawk/myst_stacks/mechanical.cpp
@@ -309,7 +309,7 @@ void Mechanical::o_birdCrankStart(uint16 var, const ArgumentsArray &args) {
_vm->_sound->playEffect(crankSoundId, true);
_birdSingEndTime = 0;
- _birdCrankStartTime = _vm->_system->getMillis();
+ _birdCrankStartTime = _vm->getTotalPlayTime();
MystAreaVideo *crankMovie = static_cast<MystAreaVideo *>(crank->getSubResource(0));
crankMovie->playMovie();
@@ -324,7 +324,7 @@ void Mechanical::o_birdCrankStop(uint16 var, const ArgumentsArray &args) {
uint16 crankSoundId = crank->getList2(1);
_vm->_sound->playEffect(crankSoundId);
- _birdSingEndTime = 2 * _vm->_system->getMillis() - _birdCrankStartTime;
+ _birdSingEndTime = 2 * _vm->getTotalPlayTime() - _birdCrankStartTime;
_birdSinging = true;
_bird->playMovie();
@@ -572,11 +572,11 @@ void Mechanical::o_elevatorGoMiddle(uint16 var, const ArgumentsArray &args) {
_elevatorTopCounter = 5;
_elevatorGoingMiddle = true;
_elevatorInCabin = true;
- _elevatorNextTime = _vm->_system->getMillis() + 1000;
+ _elevatorNextTime = _vm->getTotalPlayTime() + 1000;
}
void Mechanical::elevatorGoMiddle_run() {
- uint32 time = _vm->_system->getMillis();
+ uint32 time = _vm->getTotalPlayTime();
if (_elevatorNextTime < time) {
_elevatorNextTime = time + 1000;
_elevatorTopCounter--;
@@ -706,7 +706,7 @@ void Mechanical::o_fortressStaircase_init(uint16 var, const ArgumentsArray &args
void Mechanical::birdSing_run() {
// Used for Card 6220 (Sirrus' Mechanical Bird)
- uint32 time = _vm->_system->getMillis();
+ uint32 time = _vm->getTotalPlayTime();
if (_birdSingEndTime < time) {
_bird->pauseMovie(true);
_vm->_sound->stopEffect();