diff options
| author | Max Horn | 2003-10-15 23:16:52 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-15 23:16:52 +0000 |
| commit | d71160af749b87cb6ecfb22e3b81e2e626a0c9c3 (patch) | |
| tree | da0a6a8b199453bc7826f74510a1bd8c48202f68 /base | |
| parent | 35c23667c3a2ee800472f9104f25c08d8b1c7117 (diff) | |
| download | scummvm-rg350-d71160af749b87cb6ecfb22e3b81e2e626a0c9c3.tar.gz scummvm-rg350-d71160af749b87cb6ecfb22e3b81e2e626a0c9c3.tar.bz2 scummvm-rg350-d71160af749b87cb6ecfb22e3b81e2e626a0c9c3.zip | |
removed the kDefault*Volume constants
svn-id: r10816
Diffstat (limited to 'base')
| -rw-r--r-- | base/gameDetector.cpp | 15 | ||||
| -rw-r--r-- | base/gameDetector.h | 9 |
2 files changed, 12 insertions, 12 deletions
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index 05aa52573c..2a5ec599ec 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -115,6 +115,15 @@ static const char USAGE_STRING[] = #endif +/** Default sound/music volumes. + * @todo move this to a better place. + */ +enum { + kDefaultMasterVolume = 192, + kDefaultSFXVolume = 192, + kDefaultMusicVolume = 192 +}; + struct GraphicsMode { const char *name; const char *description; @@ -186,9 +195,9 @@ GameDetector::GameDetector() { #endif // Sound & Music - ConfMan.registerDefault("master_volume", kDefaultMasterVolume); - ConfMan.registerDefault("music_volume", kDefaultMusicVolume); - ConfMan.registerDefault("sfx_volume", kDefaultSFXVolume); + ConfMan.registerDefault("master_volume", 192); + ConfMan.registerDefault("music_volume", 192); + ConfMan.registerDefault("sfx_volume", 192); ConfMan.registerDefault("multi_midi", false); ConfMan.registerDefault("native_mt32", false); diff --git a/base/gameDetector.h b/base/gameDetector.h index 3e5eef7fca..fcb127036f 100644 --- a/base/gameDetector.h +++ b/base/gameDetector.h @@ -32,15 +32,6 @@ class OSystem; class SoundMixer; class Plugin; -/** Default sound/music volumes. - * @todo move this to a better place. - */ -enum { - kDefaultMasterVolume = 192, - kDefaultSFXVolume = 192, - kDefaultMusicVolume = 192 -}; - /** Global (shared) game feature flags. */ enum { GF_DEFAULT_TO_1X_SCALER = 1 << 31 |