[Scummvm-cvs-logs] SF.net SVN: scummvm: [26066] scummvm/trunk/gui/launcher.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 26066
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26066&view=rev
Author:   eriktorbjorn
Date:     2007-03-10 10:25:37 -0800 (Sat, 10 Mar 2007)

Log Message:
-----------
Updated the conditions for the "override" checkboxes. Most of it is probably
only noticeable if you edit the config file manually, but the volume settings
should definitely affect the Audio override if there is no separate Volume tab.

Modified Paths:
--------------
    scummvm/trunk/gui/launcher.cpp

Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp	2007-03-10 17:39:27 UTC (rev 26065)
+++ scummvm/trunk/gui/launcher.cpp	2007-03-10 18:25:37 UTC (rev 26066)
@@ -284,31 +284,39 @@
 	OptionsDialog::open();
 
 	int sel, i;
-	bool e;
+	bool e, f;
 
 	// En-/disable dialog items depending on whether overrides are active or not.
 
-	e = ConfMan.hasKey("fullscreen", _domain) ||
+	e = ConfMan.hasKey("gfx_mode", _domain) ||
+		ConfMan.hasKey("render_mode", _domain) ||
+		ConfMan.hasKey("fullscreen", _domain) ||
 		ConfMan.hasKey("aspect_ratio", _domain);
 	_globalGraphicsOverride->setState(e);
 
 	e = ConfMan.hasKey("music_driver", _domain) ||
+		ConfMan.hasKey("output_rate", _domain) ||
 		ConfMan.hasKey("subtitles", _domain) ||
 		ConfMan.hasKey("talkspeed", _domain);
-	_globalAudioOverride->setState(e);
 
-	e = ConfMan.hasKey("multi_midi", _domain) ||
-		ConfMan.hasKey("native_mt32", _domain)||
-		ConfMan.hasKey("enable_gs", _domain);
-	_globalMIDIOverride->setState(e);
-
-	e = ConfMan.hasKey("music_volume", _domain) ||
+	f = ConfMan.hasKey("music_volume", _domain) ||
 		ConfMan.hasKey("sfx_volume", _domain) ||
 		ConfMan.hasKey("speech_volume", _domain);
 
-	if (_globalVolumeOverride)
-		_globalVolumeOverride->setState(e);
+	if (_globalVolumeOverride) {
+		_globalAudioOverride->setState(e);
+		_globalVolumeOverride->setState(f);
+	} else {
+		_globalAudioOverride->setState(e || f);
+	}
 
+	e = ConfMan.hasKey("soundfont", _domain) ||
+		ConfMan.hasKey("multi_midi", _domain) ||
+		ConfMan.hasKey("native_mt32", _domain) ||
+		ConfMan.hasKey("enable_gs", _domain) ||
+		ConfMan.hasKey("midi_gain", _domain);
+	_globalMIDIOverride->setState(e);
+
 	// TODO: game path
 
 	const Common::LanguageDescription *l = Common::g_languages;


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