aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/input.cpp
diff options
context:
space:
mode:
authorMax Horn2006-04-16 19:23:14 +0000
committerMax Horn2006-04-16 19:23:14 +0000
commit74edd90aba15db1196b16b5eae918347670d11c8 (patch)
tree7410c4e14dadff2c051b42ea3a09d99987b0d6d5 /engines/scumm/input.cpp
parent08b9cd7922c48df064c17d71cc306f330043b817 (diff)
downloadscummvm-rg350-74edd90aba15db1196b16b5eae918347670d11c8.tar.gz
scummvm-rg350-74edd90aba15db1196b16b5eae918347670d11c8.tar.bz2
scummvm-rg350-74edd90aba15db1196b16b5eae918347670d11c8.zip
Fix for bug #1471383: Instead of overloading ConfigManager::set, we now have new setInt and setBool methods (matching getInt/getBool), which avoids strange quirks & bugs caused by (char *) being implicitly cast to int (ouch)
svn-id: r21951
Diffstat (limited to 'engines/scumm/input.cpp')
-rw-r--r--engines/scumm/input.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index b2e27d15fd..d2ab86b42d 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -334,18 +334,18 @@ void ScummEngine::processKbd(bool smushMode) {
switch(_voiceMode) {
case 0:
sprintf(buf, "Speech Only");
- ConfMan.set("speech_mute", false);
- ConfMan.set("subtitles", false);
+ ConfMan.setBool("speech_mute", false);
+ ConfMan.setBool("subtitles", false);
break;
case 1:
sprintf(buf, "Speech and Subtitles");
- ConfMan.set("speech_mute", false);
- ConfMan.set("subtitles", true);
+ ConfMan.setBool("speech_mute", false);
+ ConfMan.setBool("subtitles", true);
break;
case 2:
sprintf(buf, "Subtitles Only");
- ConfMan.set("speech_mute", true);
- ConfMan.set("subtitles", true);
+ ConfMan.setBool("speech_mute", true);
+ ConfMan.setBool("subtitles", true);
break;
}
@@ -434,7 +434,7 @@ void ScummEngine::processKbd(bool smushMode) {
if (vol > Audio::Mixer::kMaxMixerVolume)
vol = Audio::Mixer::kMaxMixerVolume;
- ConfMan.set("music_volume", vol);
+ ConfMan.setInt("music_volume", vol);
setupVolumes();
} else if (_lastKeyHit == '-' || _lastKeyHit == '+') { // Change text speed
if (_lastKeyHit == '+' && _defaultTalkDelay > 0)