aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2003-10-12 17:25:27 +0000
committerMax Horn2003-10-12 17:25:27 +0000
commit7747ef28d327d2bdfe145fa28f9fc25a9b26f1fd (patch)
tree15e979b875da58479bc4d1010e3985098c80caec /scumm
parent8226fbc14770ced7f0e26c4033530d46e14ec39c (diff)
downloadscummvm-rg350-7747ef28d327d2bdfe145fa28f9fc25a9b26f1fd.tar.gz
scummvm-rg350-7747ef28d327d2bdfe145fa28f9fc25a9b26f1fd.tar.bz2
scummvm-rg350-7747ef28d327d2bdfe145fa28f9fc25a9b26f1fd.zip
sfx_volume and music_volume were swapped
svn-id: r10761
Diffstat (limited to 'scumm')
-rw-r--r--scumm/scummvm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index aa1e9fa721..9bffb621c6 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -635,8 +635,8 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst)
_sound = new Sound(this);
_sound->_sound_volume_master = ConfMan.getInt("master_volume");
- _sound->_sound_volume_sfx = ConfMan.getInt("music_volume");
- _sound->_sound_volume_music = ConfMan.getInt("sfx_volume");
+ _sound->_sound_volume_sfx = ConfMan.getInt("sfx_volume");
+ _sound->_sound_volume_music = ConfMan.getInt("music_volume");
/* Initialize backend */
syst->init_size(_screenWidth, _screenHeight);