diff options
| author | Alyssa Milburn | 2011-01-30 22:42:37 +0000 |
|---|---|---|
| committer | Alyssa Milburn | 2011-01-30 22:42:37 +0000 |
| commit | c7808b90919201f6aa7e98e971d6e64fa43572db (patch) | |
| tree | 46a29e318b631a838f79fbddacd10ae8473ec42a /engines | |
| parent | b7362876dd72ba5889cb5c6e12e1ff4e6e8f9c28 (diff) | |
| download | scummvm-rg350-c7808b90919201f6aa7e98e971d6e64fa43572db.tar.gz scummvm-rg350-c7808b90919201f6aa7e98e971d6e64fa43572db.tar.bz2 scummvm-rg350-c7808b90919201f6aa7e98e971d6e64fa43572db.zip | |
MOHAWK: Handle kLBAnimOpSetTempoDiv better.
svn-id: r55668
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/mohawk/livingbooks.cpp | 22 | ||||
| -rw-r--r-- | engines/mohawk/livingbooks.h | 2 |
2 files changed, 15 insertions, 9 deletions
diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp index 4a336f4b77..24c93cd16a 100644 --- a/engines/mohawk/livingbooks.cpp +++ b/engines/mohawk/livingbooks.cpp @@ -1258,17 +1258,23 @@ NodeState LBAnimationNode::update(bool seeking) { break; case kLBAnimOpSetTempo: - case kLBAnimOpUnknownE: // TODO: complete guesswork, not in 1.x + case kLBAnimOpSetTempoDiv: { assert(entry.size == 2); uint16 tempo = (int16)READ_BE_UINT16(entry.data); - debug(4, "3: SetTempo(%d)", tempo); - if (entry.opcode == kLBAnimOpUnknownE) { - debug(4, "(beware, stupid OpUnknownE guesswork)"); + // TODO: LB 3 uses fixed-point here. + if (entry.opcode == kLBAnimOpSetTempo) { + debug(4, "3: SetTempo(%d)", tempo); + // TODO: LB 3 uses (tempo * 1000) / 60, while + // the original divides the system time by 16. + _parent->setTempo(tempo * 16); + } else { + // LB 3.0+ only. + debug(4, "E: SetTempoDiv(%d)", tempo); + _parent->setTempo(1000 / tempo); } - _parent->setTempo(tempo); } break; @@ -1516,12 +1522,12 @@ bool LBAnimation::update() { if (!_running) return false; - if (_vm->_system->getMillis() / 16 <= _lastTime + (uint32)_tempo) + if (_vm->_system->getMillis() <= _lastTime + (uint32)_tempo) return false; // the second check is to try 'catching up' with lagged animations, might be crazy - if (_lastTime == 0 || (_vm->_system->getMillis() / 16) > _lastTime + (uint32)(_tempo * 2)) - _lastTime = _vm->_system->getMillis() / 16; + if (_lastTime == 0 || (_vm->_system->getMillis()) > _lastTime + (uint32)(_tempo * 2)) + _lastTime = _vm->_system->getMillis(); else _lastTime += _tempo; diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h index 8ce1b30f4a..513db28fa8 100644 --- a/engines/mohawk/livingbooks.h +++ b/engines/mohawk/livingbooks.h @@ -106,7 +106,7 @@ enum { kLBAnimOpWaitForSound = 0xb, kLBAnimOpReleaseSound = 0xc, kLBAnimOpResetSound = 0xd, - kLBAnimOpUnknownE = 0xe, + kLBAnimOpSetTempoDiv = 0xe, kLBAnimOpDelay = 0xf }; |