aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/sound
diff options
context:
space:
mode:
authorPaul Gilbert2016-08-31 19:46:57 -0400
committerPaul Gilbert2016-08-31 19:46:57 -0400
commit15ebf3a12aae014f5b6e3cd0125eab4e421aa46b (patch)
tree97ef61b903b602027d042faf1460d01068024c12 /engines/titanic/sound
parent1fe8b6382519456ea26f1023576193c3c4e41b88 (diff)
downloadscummvm-rg350-15ebf3a12aae014f5b6e3cd0125eab4e421aa46b.tar.gz
scummvm-rg350-15ebf3a12aae014f5b6e3cd0125eab4e421aa46b.tar.bz2
scummvm-rg350-15ebf3a12aae014f5b6e3cd0125eab4e421aa46b.zip
TITANIC: Fixes to warnings, and removal of some unneeded fields
Diffstat (limited to 'engines/titanic/sound')
-rw-r--r--engines/titanic/sound/sound_manager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/titanic/sound/sound_manager.cpp b/engines/titanic/sound/sound_manager.cpp
index ae806feb52..e23fb1d207 100644
--- a/engines/titanic/sound/sound_manager.cpp
+++ b/engines/titanic/sound/sound_manager.cpp
@@ -426,7 +426,7 @@ void QSoundManager::soundFreed(Audio::SoundHandle &handle) {
}
void QSoundManager::updateVolume(int channel, uint panRate) {
- uint volume = _channelsVolume[channel] * 327;
+ double volume = _channelsVolume[channel] * 327;
switch (_channelsMode[channel]) {
case 0:
@@ -451,7 +451,7 @@ void QSoundManager::updateVolume(int channel, uint panRate) {
volume = (_musicPercent * volume) / 100;
qsWaveMixSetPanRate(channel, 0, panRate);
- qsWaveMixSetVolume(channel, 0, volume);
+ qsWaveMixSetVolume(channel, 0, (uint)volume);
}
void QSoundManager::updateVolumes() {