aboutsummaryrefslogtreecommitdiff
path: root/scumm/imuse_player.cpp
diff options
context:
space:
mode:
authorJamieson Christian2003-08-16 17:08:22 +0000
committerJamieson Christian2003-08-16 17:08:22 +0000
commitd7fae3d1cb5921e1256c9313d0ea0bf74db3523d (patch)
tree60fc1ba9dd9c782ae43251b631a60d7883bcde6b /scumm/imuse_player.cpp
parent61162bf359b251ea46f2ea4944383a92f528555a (diff)
downloadscummvm-rg350-d7fae3d1cb5921e1256c9313d0ea0bf74db3523d.tar.gz
scummvm-rg350-d7fae3d1cb5921e1256c9313d0ea0bf74db3523d.tar.bz2
scummvm-rg350-d7fae3d1cb5921e1256c9313d0ea0bf74db3523d.zip
More corrections to the VAR_MUSIC_TIMER
computations, mostly to produce the exptected output with AD resources. svn-id: r9730
Diffstat (limited to 'scumm/imuse_player.cpp')
-rw-r--r--scumm/imuse_player.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp
index a754700b37..597544823c 100644
--- a/scumm/imuse_player.cpp
+++ b/scumm/imuse_player.cpp
@@ -128,8 +128,8 @@ bool Player::startSound(int sound, MidiDriver *midi) {
return true;
}
-uint32 Player::getMusicTimer() {
- return _parser ? _parser->getTime() : 0;
+int Player::getMusicTimer() {
+ return _parser ? (_parser->getTick() * 2 / _parser->getPPQN()) : 0;
}
bool Player::isFadingOut() {