[Scummvm-cvs-logs] SF.net SVN: scummvm:[34947] scummvm/trunk/engines/sword2

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Sun Nov 9 12:52:53 CET 2008


Revision: 34947
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34947&view=rev
Author:   eriktorbjorn
Date:     2008-11-09 11:52:52 +0000 (Sun, 09 Nov 2008)

Log Message:
-----------
Moved sound-related settings to syncSoundSettings() for the global options dialog.

Modified Paths:
--------------
    scummvm/trunk/engines/sword2/sword2.cpp
    scummvm/trunk/engines/sword2/sword2.h

Modified: scummvm/trunk/engines/sword2/sword2.cpp
===================================================================
--- scummvm/trunk/engines/sword2/sword2.cpp	2008-11-09 09:58:59 UTC (rev 34946)
+++ scummvm/trunk/engines/sword2/sword2.cpp	2008-11-09 11:52:52 UTC (rev 34947)
@@ -307,7 +307,9 @@
 	ConfMan.registerDefault("reverse_stereo", false);
 }
 
-void Sword2Engine::readSettings() {
+void Sword2Engine::syncSoundSettings() {
+	// Sound settings. At the time of writing, not all of these can be set
+	// by the global options dialog, but it seems silly to split them up.
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
@@ -316,6 +318,10 @@
 	_sound->muteSpeech(ConfMan.getBool("speech_mute"));
 	_sound->muteFx(ConfMan.getBool("sfx_mute"));
 	_sound->setReverseStereo(ConfMan.getBool("reverse_stereo"));
+}
+
+void Sword2Engine::readSettings() {
+	syncSoundSettings();
 	_mouse->setObjectLabels(ConfMan.getBool("object_labels"));
 	_screen->setRenderLevel(ConfMan.getInt("gfx_details"));
 }

Modified: scummvm/trunk/engines/sword2/sword2.h
===================================================================
--- scummvm/trunk/engines/sword2/sword2.h	2008-11-09 09:58:59 UTC (rev 34946)
+++ scummvm/trunk/engines/sword2/sword2.h	2008-11-09 11:52:52 UTC (rev 34947)
@@ -122,17 +122,19 @@
 
 	StartUp _startList[MAX_starts];
 
-public:
-	Sword2Engine(OSystem *syst);
-	~Sword2Engine();
-
+protected:
 	// Engine APIs
 	virtual Common::Error init();
 	virtual Common::Error go();
 	virtual GUI::Debugger *getDebugger();
 	virtual bool hasFeature(EngineFeature f) const;
+	virtual void syncSoundSettings();
 	virtual void pauseEngineIntern(bool pause);
 
+public:
+	Sword2Engine(OSystem *syst);
+	~Sword2Engine();
+
 	int getFramesPerSecond();
 
 	void registerDefaultSettings();


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




More information about the Scummvm-git-logs mailing list