diff options
| author | Max Horn | 2003-10-08 21:59:23 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-08 21:59:23 +0000 |
| commit | d1773647159f9ef1393d7a1d33204de5886edce5 (patch) | |
| tree | d31f1a3689fa34a525671f21d7a858fe8570762f /queen | |
| parent | 3c78c0929c553fd67016f87c6cdc38d3f50d7ca2 (diff) | |
| download | scummvm-rg350-d1773647159f9ef1393d7a1d33204de5886edce5.tar.gz scummvm-rg350-d1773647159f9ef1393d7a1d33204de5886edce5.tar.bz2 scummvm-rg350-d1773647159f9ef1393d7a1d33204de5886edce5.zip | |
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS
svn-id: r10687
Diffstat (limited to 'queen')
| -rw-r--r-- | queen/queen.cpp | 5 | ||||
| -rw-r--r-- | queen/queen.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/queen/queen.cpp b/queen/queen.cpp index 59dd9c8df4..ccb9ef6f9a 100644 --- a/queen/queen.cpp +++ b/queen/queen.cpp @@ -21,6 +21,7 @@ #include "stdafx.h" #include "queen/queen.h" +#include "common/config-manager.h" #include "common/file.h" #include "base/gameDetector.h" #include "base/plugins.h" @@ -60,10 +61,10 @@ QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst) if (!_mixer->bindToSystem(syst)) warning("Sound initialisation failed."); - _mixer->setVolume(detector->_sfx_volume); + _mixer->setVolume(ConfMan.getInt("sfx_volume")); _debugMode = detector->_debugMode; - _debugLevel = detector->_debugLevel; + _debugLevel = ConfMan.getInt("debuglevel"); _detector = detector; _fastMode = 0; diff --git a/queen/queen.h b/queen/queen.h index 9eff963f79..2d2108f9a8 100644 --- a/queen/queen.h +++ b/queen/queen.h @@ -29,7 +29,6 @@ #include "sound/mixer.h" #include "queen/resource.h" #include "queen/logic.h" -#include "common/config-file.h" namespace Queen { |