diff options
| author | Max Horn | 2005-05-05 15:59:24 +0000 |
|---|---|---|
| committer | Max Horn | 2005-05-05 15:59:24 +0000 |
| commit | d00117ec4bdc0b8c79854ba8e9fbd50ecb4acda9 (patch) | |
| tree | 554ca00f5a8cb13cfae3b6f3b74181754a910af8 /sword2/driver | |
| parent | c16cceafad7aa370cacf6598b2fac24bf8337794 (diff) | |
| download | scummvm-rg350-d00117ec4bdc0b8c79854ba8e9fbd50ecb4acda9.tar.gz scummvm-rg350-d00117ec4bdc0b8c79854ba8e9fbd50ecb4acda9.tar.bz2 scummvm-rg350-d00117ec4bdc0b8c79854ba8e9fbd50ecb4acda9.zip | |
Fixed some doxygen warnings
svn-id: r17923
Diffstat (limited to 'sword2/driver')
| -rw-r--r-- | sword2/driver/d_sound.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index 94afd8ba35..1432c14a31 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -525,7 +525,7 @@ void Sound::stopMusic(bool immediately) { /** * Streams music from a cluster file. * @param musicId the id of the music to stream - * @param looping true if the music is to loop back to the start + * @param loop true if the music is to loop back to the start * @return RD_OK or an error code */ int32 Sound::streamCompMusic(uint32 musicId, bool loop) { @@ -803,25 +803,25 @@ void Sound::muteFx(bool mute) { * @param pan panning */ -int32 Sound::setFxIdVolumePan(int32 i, int vol, int pan) { - if (!_fxQueue[i].resource) +int32 Sound::setFxIdVolumePan(int32 id, int vol, int pan) { + if (!_fxQueue[id].resource) return RDERR_FXNOTOPEN; if (vol > 16) vol = 16; - _fxQueue[i].volume = (vol * SoundMixer::kMaxChannelVolume) / 16; + _fxQueue[id].volume = (vol * SoundMixer::kMaxChannelVolume) / 16; if (pan != 255) { if (isReverseStereo()) pan = -pan; - _fxQueue[i].pan = (pan * 127) / 16; + _fxQueue[id].pan = (pan * 127) / 16; } - if (!_fxMuted && _vm->_mixer->isSoundHandleActive(_fxQueue[i].handle)) { - _vm->_mixer->setChannelVolume(_fxQueue[i].handle, _fxQueue[i].volume); + if (!_fxMuted && _vm->_mixer->isSoundHandleActive(_fxQueue[id].handle)) { + _vm->_mixer->setChannelVolume(_fxQueue[id].handle, _fxQueue[id].volume); if (pan != -1) - _vm->_mixer->setChannelBalance(_fxQueue[i].handle, _fxQueue[i].pan); + _vm->_mixer->setChannelBalance(_fxQueue[id].handle, _fxQueue[id].pan); } return RD_OK; |