aboutsummaryrefslogtreecommitdiff
path: root/scumm/input.cpp
diff options
context:
space:
mode:
authorMax Horn2005-05-10 23:48:48 +0000
committerMax Horn2005-05-10 23:48:48 +0000
commit1a615346abab8f234c3dbd1c55e78b179bca9d87 (patch)
treef687ac73ffbfa29088a403b6311bb4db13265fde /scumm/input.cpp
parent72f4c03b0b9a6918a359b967ebc400a2701981d9 (diff)
downloadscummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.tar.gz
scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.tar.bz2
scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.zip
Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)
svn-id: r18039
Diffstat (limited to 'scumm/input.cpp')
-rw-r--r--scumm/input.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/input.cpp b/scumm/input.cpp
index dd2f29cafe..29b3ddfef8 100644
--- a/scumm/input.cpp
+++ b/scumm/input.cpp
@@ -448,8 +448,8 @@ void ScummEngine::processKbd(bool smushMode) {
vol = runDialog(dlg);
vol *= 16;
- if (vol > SoundMixer::kMaxMixerVolume)
- vol = SoundMixer::kMaxMixerVolume;
+ if (vol > Audio::Mixer::kMaxMixerVolume)
+ vol = Audio::Mixer::kMaxMixerVolume;
ConfMan.set("music_volume", vol);
setupVolumes();