diff options
| author | Torbjörn Andersson | 2006-03-01 07:27:35 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2006-03-01 07:27:35 +0000 |
| commit | 3a38721d028a2a2e738fb806fc22fc36863a0a3d (patch) | |
| tree | c4fe2fe6fe415e9f09bc652e0bde796e2e2055f0 | |
| parent | 55739f1715fee58b2dbf3ba82198daad239c9a23 (diff) | |
| download | scummvm-rg350-3a38721d028a2a2e738fb806fc22fc36863a0a3d.tar.gz scummvm-rg350-3a38721d028a2a2e738fb806fc22fc36863a0a3d.tar.bz2 scummvm-rg350-3a38721d028a2a2e738fb806fc22fc36863a0a3d.zip | |
Cleaned up updateCallback36() and renamed it setVibratoDepth().
svn-id: r20985
| -rw-r--r-- | engines/kyra/sound_adlib.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp index e7a539c852..640b2549f8 100644 --- a/engines/kyra/sound_adlib.cpp +++ b/engines/kyra/sound_adlib.cpp @@ -220,7 +220,7 @@ private: int updateCallback33(uint8 *&dataptr, OutputState &state, uint8 value); int updateCallback34(uint8 *&dataptr, OutputState &state, uint8 value); int setAMDepth(uint8 *&dataptr, OutputState &state, uint8 value); - int updateCallback36(uint8 *&dataptr, OutputState &state, uint8 value); + int setVibratoDepth(uint8 *&dataptr, OutputState &state, uint8 value); int updateCallback37(uint8 *&dataptr, OutputState &state, uint8 value); int updateCallback38(uint8 *&dataptr, OutputState &state, uint8 value); int updateCallback39(uint8 *&dataptr, OutputState &state, uint8 value); @@ -1212,12 +1212,13 @@ int AdlibDriver::setAMDepth(uint8 *&dataptr, OutputState &state, uint8 value) { return 0; } -int AdlibDriver::updateCallback36(uint8 *&dataptr, OutputState &state, uint8 value) { - value &= 1; - value <<= 6; - _unkOutputByte2 = (_unkOutputByte2 & 0xBF) | value; +int AdlibDriver::setVibratoDepth(uint8 *&dataptr, OutputState &state, uint8 value) { + if (value & 1) + _unkOutputByte2 |= 0x40; + else + _unkOutputByte2 &= 0xBF; - // AM depth / Vibrato depth / Rhythm control + // The Vibrato Depth bit is set or cleared, the others remain unchanged output0x388(0xBD00 | _unkOutputByte2); return 0; } @@ -1742,7 +1743,7 @@ const AdlibDriver::ParserOpcode AdlibDriver::_parserOpcodeTable[] = { COMMAND(updateCallback33), COMMAND(updateCallback34), COMMAND(setAMDepth), - COMMAND(updateCallback36), + COMMAND(setVibratoDepth), // 48 COMMAND(updateCallback37), |