diff options
| author | lukaslw | 2014-06-22 19:59:00 +0200 |
|---|---|---|
| committer | lukaslw | 2014-06-22 20:00:45 +0200 |
| commit | 5a8b68676b8f6b31123e88ebdfbef1be4e57a717 (patch) | |
| tree | 02ea77ebb3e058a29e9c274fd8d5efd94bb6bab3 /audio/mixer.cpp | |
| parent | 770a45390d4422dc9cbcb213808861297ba8e620 (diff) | |
| parent | c340570138e84277d39c64aaa7fdaf6d8be2cefb (diff) | |
| download | scummvm-rg350-5a8b68676b8f6b31123e88ebdfbef1be4e57a717.tar.gz scummvm-rg350-5a8b68676b8f6b31123e88ebdfbef1be4e57a717.tar.bz2 scummvm-rg350-5a8b68676b8f6b31123e88ebdfbef1be4e57a717.zip | |
Merge branch 'master' into prince-lukaslw
Diffstat (limited to 'audio/mixer.cpp')
| -rw-r--r-- | audio/mixer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/audio/mixer.cpp b/audio/mixer.cpp index 0620d07a29..16cf5640eb 100644 --- a/audio/mixer.cpp +++ b/audio/mixer.cpp @@ -333,7 +333,7 @@ void MixerImpl::stopHandle(SoundHandle handle) { } void MixerImpl::muteSoundType(SoundType type, bool mute) { - assert(0 <= type && type < ARRAYSIZE(_soundTypeSettings)); + assert(0 <= (int)type && (int)type < ARRAYSIZE(_soundTypeSettings)); _soundTypeSettings[type].mute = mute; for (int i = 0; i != NUM_CHANNELS; ++i) { @@ -343,7 +343,7 @@ void MixerImpl::muteSoundType(SoundType type, bool mute) { } bool MixerImpl::isSoundTypeMuted(SoundType type) const { - assert(0 <= type && type < ARRAYSIZE(_soundTypeSettings)); + assert(0 <= (int)type && (int)type < ARRAYSIZE(_soundTypeSettings)); return _soundTypeSettings[type].mute; } @@ -468,7 +468,7 @@ bool MixerImpl::hasActiveChannelOfType(SoundType type) { } void MixerImpl::setVolumeForSoundType(SoundType type, int volume) { - assert(0 <= type && type < ARRAYSIZE(_soundTypeSettings)); + assert(0 <= (int)type && (int)type < ARRAYSIZE(_soundTypeSettings)); // Check range if (volume > kMaxMixerVolume) @@ -489,7 +489,7 @@ void MixerImpl::setVolumeForSoundType(SoundType type, int volume) { } int MixerImpl::getVolumeForSoundType(SoundType type) const { - assert(0 <= type && type < ARRAYSIZE(_soundTypeSettings)); + assert(0 <= (int)type && (int)type < ARRAYSIZE(_soundTypeSettings)); return _soundTypeSettings[type].volume; } |