aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTarek Soliman2011-10-25 23:34:15 -0500
committerTarek Soliman2011-10-27 09:48:21 -0500
commitf30df9aa7059a336506a39de37b5b5f099e22c35 (patch)
tree8f677a70cc1953a309afe29b8d76602a22361117
parent44e4e16819186d45e3a1adeed311218b92bbf283 (diff)
downloadscummvm-rg350-f30df9aa7059a336506a39de37b5b5f099e22c35.tar.gz
scummvm-rg350-f30df9aa7059a336506a39de37b5b5f099e22c35.tar.bz2
scummvm-rg350-f30df9aa7059a336506a39de37b5b5f099e22c35.zip
GUI: Enable EGA Undithering in global options dialog
GUIO_EGAUNDITHER is a positive flag unlike the rest of the GUIO negative flags like GUIO_NOASPECT and GUIO_NOSPEECH. This means the gui option is only enabled if the flag exists. This caused the gui option to be disabled in the global options dialog due to the flag not existing in the global confman domain. It is an inconvenience and a regression IMHO to have to set this flag on a game by game basis with no option to set it globally and have the games override it. Thanks Strangerke for making me clarify. Thanks LordHoto for feedback on code style.
-rw-r--r--gui/options.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/options.cpp b/gui/options.cpp
index 2291bb5ee9..4ded2edca3 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -216,7 +216,7 @@ void OptionsDialog::open() {
#endif // SMALL_SCREEN_DEVICE
// EGA undithering setting
- if (_guioptions.contains(GUIO_EGAUNDITHER)) {
+ if (_guioptions.contains(GUIO_EGAUNDITHER) || _domain == Common::ConfigManager::kApplicationDomain) {
_disableDitheringCheckbox->setEnabled(true);
_disableDitheringCheckbox->setState(ConfMan.getBool("disable_dithering", _domain));
} else {
@@ -609,7 +609,7 @@ void OptionsDialog::setGraphicSettingsState(bool enabled) {
else
_aspectCheckbox->setEnabled(enabled);
#endif
- if (_guioptions.contains(GUIO_EGAUNDITHER))
+ if (_guioptions.contains(GUIO_EGAUNDITHER) && enabled)
_disableDitheringCheckbox->setEnabled(true);
else
_disableDitheringCheckbox->setEnabled(false);