[Scummvm-cvs-logs] SF.net SVN: scummvm:[35437] scummvm/trunk/engines/saga

[thebluegr at users.sourceforge.net]

Revision: 35437
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35437&view=rev
Author:   thebluegr
Date:     2008-12-19 12:03:22 +0000 (Fri, 19 Dec 2008)

Log Message:
-----------
Removed the hasKey() hackery of my previous commit and used ConfMan.registerDefault() instead. Changed sound_volume back to sfx_volume, which got changed with the GSoC merge and was the actual cause that the sound effects were off by default

Modified Paths:
--------------
    scummvm/trunk/engines/saga/interface.cpp
    scummvm/trunk/engines/saga/saga.cpp
    scummvm/trunk/engines/saga/sound.cpp

Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp	2008-12-19 10:54:05 UTC (rev 35436)
+++ scummvm/trunk/engines/saga/interface.cpp	2008-12-19 12:03:22 UTC (rev 35437)
@@ -1637,7 +1637,7 @@
 	case kTextSound:
 		_vm->_soundVolume = _vm->_soundVolume + 25;
 		if (_vm->_soundVolume > 255) _vm->_soundVolume = 0;
-		ConfMan.setInt("sound_volume", _vm->_soundVolume);
+		ConfMan.setInt("sfx_volume", _vm->_soundVolume);
 		_vm->_sound->setVolume();
 		break;
 	case kTextVoices:

Modified: scummvm/trunk/engines/saga/saga.cpp
===================================================================
--- scummvm/trunk/engines/saga/saga.cpp	2008-12-19 10:54:05 UTC (rev 35436)
+++ scummvm/trunk/engines/saga/saga.cpp	2008-12-19 12:03:22 UTC (rev 35437)
@@ -141,10 +141,18 @@
 }
 
 Common::Error SagaEngine::init() {
-	_musicVolume = ConfMan.hasKey("music_volume") ? ConfMan.getInt("music_volume") : 255;
-	_subtitlesEnabled = ConfMan.hasKey("subtitles") ? ConfMan.getBool("subtitles") : true;
+	// Assign default values to the config manager, in case settings are missing
+	ConfMan.registerDefault("music_volume", "255");
+	ConfMan.registerDefault("sfx_volume", "255");
+	ConfMan.registerDefault("speech_volume", "255");
+	ConfMan.registerDefault("talkspeed", "255");
+	ConfMan.registerDefault("subtitles", "true");
+	ConfMan.registerDefault("copy_protection", "false");
+
+	_musicVolume = ConfMan.getInt("music_volume");
+	_subtitlesEnabled = ConfMan.getBool("subtitles");
 	_readingSpeed = getTalkspeed();
-	_copyProtection = ConfMan.hasKey("copy_protection") ? ConfMan.getBool("copy_protection") : false;
+	_copyProtection = ConfMan.getBool("copy_protection");
 	_gf_wyrmkeep = false;
 	_gf_compressed_sounds = false;
 	_musicWasPlaying = false;
@@ -217,7 +225,7 @@
 				_voicesEnabled = true;
 				ConfMan.setBool("voices", true);
 			} else {
-				_voicesEnabled = ConfMan.hasKey("voices") ? ConfMan.getBool("voices") : true;
+				_voicesEnabled = ConfMan.getBool("voices");
 			}
 		} else {
 			_voicesEnabled = true;
@@ -518,17 +526,17 @@
 }
 
 int SagaEngine::getTalkspeed() {
-	return ((ConfMan.hasKey("talkspeed") ? ConfMan.getInt("talkspeed") : 255) * 3 + 255 / 2) / 255;
+	return (ConfMan.getInt("talkspeed") * 3 + 255 / 2) / 255;
 }
 
 void SagaEngine::syncSoundSettings() {
-	_subtitlesEnabled = ConfMan.hasKey("subtitles") ? ConfMan.getBool("subtitles") : true;
+	_subtitlesEnabled = ConfMan.getBool("subtitles");
 	_readingSpeed = getTalkspeed();
 
 	if (_readingSpeed > 3)
 		_readingSpeed = 0;
 
-	_musicVolume = ConfMan.hasKey("music_volume") ? ConfMan.getInt("music_volume") : 255;
+	_musicVolume = ConfMan.getInt("music_volume");
 	_music->setVolume(_musicVolume, 1);
 	_sound->setVolume();
 }

Modified: scummvm/trunk/engines/saga/sound.cpp
===================================================================
--- scummvm/trunk/engines/saga/sound.cpp	2008-12-19 10:54:05 UTC (rev 35436)
+++ scummvm/trunk/engines/saga/sound.cpp	2008-12-19 12:03:22 UTC (rev 35437)
@@ -206,8 +206,8 @@
 }
 
 void Sound::setVolume() {
-	_vm->_soundVolume = ConfMan.hasKey("sound_volume") ? ConfMan.getInt("sound_volume") : 255;
-	_vm->_speechVolume = ConfMan.hasKey("speech_volume") ? ConfMan.getInt("speech_volume") : 255;
+	_vm->_soundVolume = ConfMan.getInt("sfx_volume");
+	_vm->_speechVolume = ConfMan.getInt("speech_volume");
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, _vm->_soundVolume);
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, _vm->_speechVolume);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.