diff options
| author | athrxx | 2011-11-06 17:53:52 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-12-26 16:18:15 +0100 |
| commit | 816b40ebf8c653f4c3f898ae4697ea85f5fe015f (patch) | |
| tree | 4df3e6b89eee4770b70dbcf967359b92dfdb7f78 /engines/kyra/sound_lol.cpp | |
| parent | 2448d885e4e331a22e1e468277142155a5ddda87 (diff) | |
| download | scummvm-rg350-816b40ebf8c653f4c3f898ae4697ea85f5fe015f.tar.gz scummvm-rg350-816b40ebf8c653f4c3f898ae4697ea85f5fe015f.tar.bz2 scummvm-rg350-816b40ebf8c653f4c3f898ae4697ea85f5fe015f.zip | |
KYRA: (EOB) - add debugger, etc.
- add basic debugger support
- fix several minor bugs
Diffstat (limited to 'engines/kyra/sound_lol.cpp')
| -rw-r--r-- | engines/kyra/sound_lol.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp index 6bf047fe35..a37ec9f674 100644 --- a/engines/kyra/sound_lol.cpp +++ b/engines/kyra/sound_lol.cpp @@ -167,8 +167,8 @@ void LoLEngine::snd_playSoundEffect(int track, int volume) { volume &= 0xff; int16 volIndex = (int16)READ_LE_UINT16(&_ingameSoundIndex[track * 2 + 1]); - volume = (volIndex > 0) ? (volIndex * volume) >> 8 : -volIndex; - volume = CLIP(volume >> 4, 2, 13) * 7 + 164; + uint16 vocLevel = (volIndex > 0) ? (volIndex * volume) >> 8 : -volIndex; + vocLevel = CLIP(volume >> 4, 2, 13) * 7 + 164; int16 vocIndex = (int16)READ_LE_UINT16(&_ingameSoundIndex[track * 2]); @@ -180,7 +180,7 @@ void LoLEngine::snd_playSoundEffect(int track, int volume) { if (hasVocFile) { if (_sound->isVoicePresent(_ingameSoundList[vocIndex])) - _sound->voicePlay(_ingameSoundList[vocIndex], 0, volume & 0xff, true); + _sound->voicePlay(_ingameSoundList[vocIndex], 0, vocLevel & 0xff, true); } else if (_flags.platform == Common::kPlatformPC) { if (_sound->getSfxType() == Sound::kMidiMT32) track = (track < _ingameMT32SoundIndexSize) ? (_ingameMT32SoundIndex[track] - 1) : -1; |