aboutsummaryrefslogtreecommitdiff
path: root/sword1/sword1.cpp
diff options
context:
space:
mode:
authorRobert Göffringmann2004-01-06 11:48:30 +0000
committerRobert Göffringmann2004-01-06 11:48:30 +0000
commite34d7b6c41054fb1093a1967639d2a328eabd5f8 (patch)
tree841d0036eb2eeb73dcb90a589c66c354cc7b5d69 /sword1/sword1.cpp
parentcc67301791cd46bc6e81bb76ef30c45d692a7547 (diff)
downloadscummvm-rg350-e34d7b6c41054fb1093a1967639d2a328eabd5f8.tar.gz
scummvm-rg350-e34d7b6c41054fb1093a1967639d2a328eabd5f8.tar.bz2
scummvm-rg350-e34d7b6c41054fb1093a1967639d2a328eabd5f8.zip
get volume from gamedetector
svn-id: r12169
Diffstat (limited to 'sword1/sword1.cpp')
-rw-r--r--sword1/sword1.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp
index 9ee4c9102e..85cf4f05c6 100644
--- a/sword1/sword1.cpp
+++ b/sword1/sword1.cpp
@@ -109,6 +109,12 @@ void SwordEngine::initialize(void) {
_logic = new SwordLogic(_objectMan, _resMan, _screen, _mouse, _sound, _music, _menu);
_mouse->useLogicAndMenu(_logic, _menu);
+ _music->setVolume((uint8)ConfMan.getInt("music_volume"));
+ uint8 speechVol = (uint8)ConfMan.getInt("speech_volume");
+ if (!speechVol)
+ speechVol = 192;
+ _sound->setVolume((uint8)ConfMan.getInt("sfx_volume"), speechVol);
+
_systemVars.justRestoredGame = _systemVars.currentCD =
_systemVars.gamePaused = 0;
_systemVars.deathScreenFlag = 3;