diff options
| author | Christopher Page | 2008-06-30 23:06:38 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-06-30 23:06:38 +0000 |
| commit | 563e28b668a44e830c26702b21f1d75cccb6cf03 (patch) | |
| tree | 3cafdfba80910873f70140187ab5dba06d2c24a3 /engines/lure/sound.cpp | |
| parent | c1ae3f7dd0fc52df450c136ecad14cedda26a20c (diff) | |
| download | scummvm-rg350-563e28b668a44e830c26702b21f1d75cccb6cf03.tar.gz scummvm-rg350-563e28b668a44e830c26702b21f1d75cccb6cf03.tar.bz2 scummvm-rg350-563e28b668a44e830c26702b21f1d75cccb6cf03.zip | |
Fixed some warnings
svn-id: r32857
Diffstat (limited to 'engines/lure/sound.cpp')
| -rw-r--r-- | engines/lure/sound.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/lure/sound.cpp b/engines/lure/sound.cpp index 9253f03b28..94b7455a1f 100644 --- a/engines/lure/sound.cpp +++ b/engines/lure/sound.cpp @@ -579,12 +579,12 @@ void SoundManager::doTimer() { /*------------------------------------------------------------------------*/ MidiMusic::MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], - uint8 channelNum, uint8 soundNum, bool isMusic, uint8 numChannels, void *soundData, uint32 size) { + uint8 channelNum, uint8 soundNum, bool isMus, uint8 numChannels, void *soundData, uint32 size) { _driver = driver; _channels = channels; _soundNumber = soundNum; _channelNumber = channelNum; - _isMusic = isMusic; + _isMusic = isMus; _numChannels = numChannels; _volume = 0; @@ -593,7 +593,7 @@ MidiMusic::MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], _channels[_channelNumber + i].volume = 90; } - if (isMusic) + if (_isMusic) setVolume(ConfMan.getInt("music_volume")); else setVolume(ConfMan.getInt("sfx_volume")); |