diff options
| author | Florian Kagerer | 2009-10-18 17:28:00 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2009-10-18 17:28:00 +0000 |
| commit | 237b66becad31decb5230389ac91459f19db7545 (patch) | |
| tree | d45ea5a66560a655cebd762b446176982ccdb7bf /engines/kyra/sound_lol.cpp | |
| parent | e392f939b6c8025c33c37b489d161286db250100 (diff) | |
| download | scummvm-rg350-237b66becad31decb5230389ac91459f19db7545.tar.gz scummvm-rg350-237b66becad31decb5230389ac91459f19db7545.tar.bz2 scummvm-rg350-237b66becad31decb5230389ac91459f19db7545.zip | |
LOL: - added some updateInputs to spell animation code
- improved sfx volume code
svn-id: r45227
Diffstat (limited to 'engines/kyra/sound_lol.cpp')
| -rw-r--r-- | engines/kyra/sound_lol.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp index 52fb9eeb43..41a3936172 100644 --- a/engines/kyra/sound_lol.cpp +++ b/engines/kyra/sound_lol.cpp @@ -167,15 +167,11 @@ void LoLEngine::snd_playSoundEffect(int track, int volume) { if (track == -1) return; + volume &= 0xff; int16 volIndex = (int16)READ_LE_UINT16(&_ingameSoundIndex[track * 2 + 1]); - if (volIndex > 0) - volume = (volIndex * volume) >> 8; - else if (volIndex < 0) - volume = -volIndex; - - // volume TODO - volume = 254 - volume; + volume = (volIndex > 0) ? (volIndex * volume) >> 8 : -volIndex; + volume = CLIP(volume >> 4, 2, 13) * 7 + 164; int16 vocIndex = (int16)READ_LE_UINT16(&_ingameSoundIndex[track * 2]); |