diff options
author | Jamieson Christian | 2003-08-16 06:17:27 +0000 |
---|---|---|
committer | Jamieson Christian | 2003-08-16 06:17:27 +0000 |
commit | 4da3bf3a61eec24faa48f3cc7fd6defabfe040d2 (patch) | |
tree | 2a0f8045ebad7ea52c3c810dce9bd95486896e14 /scumm | |
parent | 2750eabcd5727f0af64360beaa249bc1d1277d9c (diff) | |
download | scummvm-rg350-4da3bf3a61eec24faa48f3cc7fd6defabfe040d2.tar.gz scummvm-rg350-4da3bf3a61eec24faa48f3cc7fd6defabfe040d2.tar.bz2 scummvm-rg350-4da3bf3a61eec24faa48f3cc7fd6defabfe040d2.zip |
Fixed transpose/detune computations
svn-id: r9715
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/imuse.cpp | 6 | ||||
-rw-r--r-- | scumm/imuse_player.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp index 6dd630af8d..542fcbeb78 100644 --- a/scumm/imuse.cpp +++ b/scumm/imuse.cpp @@ -1419,11 +1419,11 @@ void Part::set_pan(int8 pan) { } void Part::set_transpose(int8 transpose) { - _transpose_eff = transpose_clamp((_transpose = transpose) + _player->getTranspose(), -12, 12); + _transpose_eff = transpose_clamp((_transpose = transpose) + _player->getTranspose(), -24, 24); if (_mc) { _mc->pitchBend(clamp(_pitchbend + - (_detune_eff * 64 / 12) + - (_transpose_eff * 8192 / 12), -8192, 8191)); + (_detune_eff * /*64*/82 / _pitchbend_factor) + + (_transpose_eff * 8192 / _pitchbend_factor), -8192, 8191)); } } diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp index 2b7bca700e..a85e7428a2 100644 --- a/scumm/imuse_player.cpp +++ b/scumm/imuse_player.cpp @@ -652,7 +652,7 @@ int Player::setTranspose(byte relative, int b) { if (b > 24 || b < -24 || relative > 1) return -1; if (relative) - b = transpose_clamp(_transpose + b, -7, 7); + b = transpose_clamp(_transpose + b, -24, 24); _transpose = b; |