diff options
author | Jamieson Christian | 2002-12-13 15:16:40 +0000 |
---|---|---|
committer | Jamieson Christian | 2002-12-13 15:16:40 +0000 |
commit | caf0eccb2d3f1b3810302e7ec2ef77bb5ced248e (patch) | |
tree | 64ba7fcc9ac1cee1553e1ffbeb1ff6a58f23c832 /scumm/imuse.cpp | |
parent | ddca690c288164f98f8ba097f160cb7f2541ed33 (diff) | |
download | scummvm-rg350-caf0eccb2d3f1b3810302e7ec2ef77bb5ced248e.tar.gz scummvm-rg350-caf0eccb2d3f1b3810302e7ec2ef77bb5ced248e.tar.bz2 scummvm-rg350-caf0eccb2d3f1b3810302e7ec2ef77bb5ced248e.zip |
Bug [622895] fix:
Fixed do_command(256) implementation.
svn-id: r5927
Diffstat (limited to 'scumm/imuse.cpp')
-rw-r--r-- | scumm/imuse.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp index 36d2b9cef8..b0e83aba09 100644 --- a/scumm/imuse.cpp +++ b/scumm/imuse.cpp @@ -1519,9 +1519,10 @@ int32 IMuseInternal::do_command(int a, int b, int c, int d, int e, int f, int g, switch (cmd) { case 0: if (g_scumm->_gameId == GID_SAMNMAX) { - if (d == 1) - return player->_marker; - else if (d == 2) + if (d == 1) // Measure number + // return player->_marker; + return ((player->_beat_index - 1) >> 2) + 1; + else if (d == 2) // Beat number return player->_beat_index; return -1; } else { |