aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJames Brown2002-03-06 00:00:38 +0000
committerJames Brown2002-03-06 00:00:38 +0000
commite05f3534b40fce5b5f7063631913134cc77ab422 (patch)
tree60b61e9741687341b3055e5c87af4a2683dd2869 /sound
parentc21e9da1b6c46f145f8061ca77dd5b9b9627e782 (diff)
downloadscummvm-rg350-e05f3534b40fce5b5f7063631913134cc77ab422.tar.gz
scummvm-rg350-e05f3534b40fce5b5f7063631913134cc77ab422.tar.bz2
scummvm-rg350-e05f3534b40fce5b5f7063631913134cc77ab422.zip
Fix typo in music volume, and add -m parameter to set it.
svn-id: r3659
Diffstat (limited to 'sound')
-rw-r--r--sound/imuse.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/imuse.cpp b/sound/imuse.cpp
index 1f48db9982..8c3a4a5d9a 100644
--- a/sound/imuse.cpp
+++ b/sound/imuse.cpp
@@ -627,9 +627,9 @@ int SoundEngine::set_music_volume(uint vol) {
if (vol > 100)
vol = 100;
- if (vol < 1);
+ if (vol < 1)
vol = 1;
-
+
_music_volume = vol;
return 0;
}
@@ -923,7 +923,7 @@ int SoundEngine::initialize(Scumm *scumm, SoundDriver *driver) {
_driver = (SOUND_DRIVER_TYPE*)driver;
_master_volume = 127;
- _music_volume = 60;
+ if (_music_volume < 1) _music_volume = 60;
for (i=0; i!=8; i++)
_channel_volume[i] = _channel_volume_eff[i] = _volchan_table[i] = 127;