[Scummvm-cvs-logs] SF.net SVN: scummvm:[54090] scummvm/trunk
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Fri Nov 5 11:53:37 CET 2010
Revision: 54090
http://scummvm.svn.sourceforge.net/scummvm/?rev=54090&view=rev
Author: thebluegr
Date: 2010-11-05 10:53:37 +0000 (Fri, 05 Nov 2010)
Log Message:
-----------
COMMON/GUI/SCI: Changes to the EGA dithering checkbox
- Changed the new dithering checkbox to be more generic (i.e. relevant for all engines that may support such a feature in the future)
- Changed the checkbox to be unchecked by default. As discussed on -devel, game enhancements in ScummVM should be off by default, and opt-in
- Changed the option from "sci_undither" to "disable_dithering"
- Changed theme version style to X.Y.Z and bumped it to 0.8.2
Modified Paths:
--------------
scummvm/trunk/README
scummvm/trunk/base/commandLine.cpp
scummvm/trunk/engines/sci/sci.cpp
scummvm/trunk/gui/ThemeEngine.h
scummvm/trunk/gui/launcher.cpp
scummvm/trunk/gui/options.cpp
scummvm/trunk/gui/options.h
scummvm/trunk/gui/themes/default.inc
scummvm/trunk/gui/themes/scummclassic/THEMERC
scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx
scummvm/trunk/gui/themes/scummclassic.zip
scummvm/trunk/gui/themes/scummmodern/THEMERC
scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx
scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx
scummvm/trunk/gui/themes/scummmodern.zip
Modified: scummvm/trunk/README
===================================================================
--- scummvm/trunk/README 2010-11-05 10:31:36 UTC (rev 54089)
+++ scummvm/trunk/README 2010-11-05 10:53:37 UTC (rev 54090)
@@ -1926,92 +1926,92 @@
The following keywords are recognized:
- path string The path to where a game's data files are
- autosave_period number The seconds between autosaving (default: 300)
- save_slot number The savegame number to load on startup.
- savepath string The path to where a game will store its
- savegames.
- versioninfo string The version of the ScummVM that created the
- configuration file.
+ path string The path to where a game's data files are
+ autosave_period number The seconds between autosaving (default: 300)
+ save_slot number The savegame number to load on startup.
+ savepath string The path to where a game will store its
+ savegames.
+ versioninfo string The version of the ScummVM that created the
+ configuration file.
- gameid string The real id of a game. Useful if you have
- several versions of the same game, and want
- different aliases for them. See the example.
- description string The description of the game as it will appear
- in the launcher.
+ gameid string The real id of a game. Useful if you have
+ several versions of the same game, and want
+ different aliases for them. See the example.
+ description string The description of the game as it will appear
+ in the launcher.
- language string Specify language (en, us, de, fr, it, pt, es,
- jp, zh, kr, se, gb, hb, cz, ru)
- speech_mute bool If true, speech is muted
- subtitles bool Set to true to enable subtitles.
- talkspeed number Text delay in SCUMM games, or text speed in
- other games.
+ language string Specify language (en, us, de, fr, it, pt, es,
+ jp, zh, kr, se, gb, hb, cz, ru)
+ speech_mute bool If true, speech is muted
+ subtitles bool Set to true to enable subtitles.
+ talkspeed number Text delay in SCUMM games, or text speed in
+ other games.
- fullscreen bool Fullscreen mode
- aspect_ratio bool Enable aspect ratio correction
- sci_undither bool Remove dithering artifacts from early SCI EGA games
- gfx_mode string Graphics mode (normal, 2x, 3x, 2xsai,
- super2xsai, supereagle, advmame2x, advmame3x,
- hq2x, hq3x, tv2x, dotmatrix)
+ fullscreen bool Fullscreen mode
+ aspect_ratio bool Enable aspect ratio correction
+ disable_dithering bool Remove dithering artifacts from EGA games
+ gfx_mode string Graphics mode (normal, 2x, 3x, 2xsai,
+ super2xsai, supereagle, advmame2x, advmame3x,
+ hq2x, hq3x, tv2x, dotmatrix)
- confirm_exit bool Ask for confirmation by the user before quitting
- (SDL backend only).
- cdrom number Number of CD-ROM unit to use for audio. If
- negative, don't even try to access the CD-ROM.
- joystick_num number Number of joystick device to use for input
- music_driver string The music engine to use.
- opl_driver string The AdLib (OPL) emulator to use.
- output_rate number The output sample rate to use, in Hz. Sensible
- values are 11025, 22050 and 44100.
- alsa_port string Port to use for output when using the
- ALSA music driver.
- music_volume number The music volume setting (0-255)
- multi_midi bool If true, enable combination AdLib and native
- MIDI.
- soundfont string The SoundFont to use for MIDI playback. (Only
- supported by some MIDI drivers.)
- native_mt32 bool If true, disable GM emulation and assume that
- there is a true Roland MT-32 available.
- enable_gs bool If true, enable Roland GS-specific features to
- enhance GM emulation. If native_mt32 is also
- true, the GS device will select an MT-32 map
- to play the correct instruments.
- sfx_volume number The sfx volume setting (0-255)
- tempo number The music tempo (50-200) (default: 100)
- speech_volume number The speech volume setting (0-255)
- midi_gain number The MIDI gain (0-1000) (default: 100) (Only
- supported by some MIDI drivers.)
+ confirm_exit bool Ask for confirmation by the user before quitting
+ (SDL backend only).
+ cdrom number Number of CD-ROM unit to use for audio. If
+ negative, don't even try to access the CD-ROM.
+ joystick_num number Number of joystick device to use for input
+ music_driver string The music engine to use.
+ opl_driver string The AdLib (OPL) emulator to use.
+ output_rate number The output sample rate to use, in Hz. Sensible
+ values are 11025, 22050 and 44100.
+ alsa_port string Port to use for output when using the
+ ALSA music driver.
+ music_volume number The music volume setting (0-255)
+ multi_midi bool If true, enable combination AdLib and native
+ MIDI.
+ soundfont string The SoundFont to use for MIDI playback. (Only
+ supported by some MIDI drivers.)
+ native_mt32 bool If true, disable GM emulation and assume that
+ there is a true Roland MT-32 available.
+ enable_gs bool If true, enable Roland GS-specific features to
+ enhance GM emulation. If native_mt32 is also
+ true, the GS device will select an MT-32 map
+ to play the correct instruments.
+ sfx_volume number The sfx volume setting (0-255)
+ tempo number The music tempo (50-200) (default: 100)
+ speech_volume number The speech volume setting (0-255)
+ midi_gain number The MIDI gain (0-1000) (default: 100) (Only
+ supported by some MIDI drivers.)
- copy_protection bool Enable copy protection in certain games, in those
- cases where ScummVM disables it by default.
- demo_mode bool Start demo in Maniac Mansion
- alt_intro bool Use alternative intro for CD versions of
- Beneath a Steel Sky and Flight of the Amazon
- Queen
+ copy_protection bool Enable copy protection in certain games, in
+ those cases where ScummVM disables it by default.
+ demo_mode bool Start demo in Maniac Mansion
+ alt_intro bool Use alternative intro for CD versions of
+ Beneath a Steel Sky and Flight of the Amazon
+ Queen
- boot_param number Pass this number to the boot script
+ boot_param number Pass this number to the boot script
Broken Sword II adds the following non-standard keywords:
- gfx_details number Graphics details setting (0-3)
- music_mute bool If true, music is muted
- object_labels bool If true, object labels are enabled
- reverse_stereo bool If true, stereo channels are reversed
- sfx_mute bool If true, sound effects are muted
+ gfx_details number Graphics details setting (0-3)
+ music_mute bool If true, music is muted
+ object_labels bool If true, object labels are enabled
+ reverse_stereo bool If true, stereo channels are reversed
+ sfx_mute bool If true, sound effects are muted
Flight of the Amazon Queen adds the following non-standard keywords:
- music_mute bool If true, music is muted
- sfx_mute bool If true, sound effects are muted
+ music_mute bool If true, music is muted
+ sfx_mute bool If true, sound effects are muted
Simon the Sorcerer 1 and 2 add the following non-standard keywords:
- music_mute bool If true, music is muted
- sfx_mute bool If true, sound effects are muted
+ music_mute bool If true, music is muted
+ sfx_mute bool If true, sound effects are muted
The Legend of Kyrandia adds the following non-standard keyword:
- walkspeed int The walk speed (0-4)
+ walkspeed int The walk speed (0-4)
9.0) Compiling:
Modified: scummvm/trunk/base/commandLine.cpp
===================================================================
--- scummvm/trunk/base/commandLine.cpp 2010-11-05 10:31:36 UTC (rev 54089)
+++ scummvm/trunk/base/commandLine.cpp 2010-11-05 10:53:37 UTC (rev 54090)
@@ -157,7 +157,7 @@
// Graphics
ConfMan.registerDefault("fullscreen", false);
ConfMan.registerDefault("aspect_ratio", false);
- ConfMan.registerDefault("sci_undither", true);
+ ConfMan.registerDefault("disable_dithering", false);
ConfMan.registerDefault("gfx_mode", "normal");
ConfMan.registerDefault("render_mode", "default");
ConfMan.registerDefault("desired_screen_aspect_ratio", "auto");
Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp 2010-11-05 10:31:36 UTC (rev 54089)
+++ scummvm/trunk/engines/sci/sci.cpp 2010-11-05 10:53:37 UTC (rev 54090)
@@ -180,7 +180,6 @@
g_eventRec.registerRandomSource(_rng, "sci");
// Assign default values to the config manager, in case settings are missing
- ConfMan.registerDefault("sci_undither", "true");
ConfMan.registerDefault("sci_originalsaveload", "false");
ConfMan.registerDefault("native_fb01", "false");
@@ -210,7 +209,7 @@
// Initialize the game screen
_gfxScreen = new GfxScreen(_resMan);
- _gfxScreen->debugUnditherSetState(ConfMan.getBool("sci_undither"));
+ _gfxScreen->debugUnditherSetState(ConfMan.getBool("disable_dithering"));
// Create debugger console. It requires GFX to be initialized
_console = new Console(this);
Modified: scummvm/trunk/gui/ThemeEngine.h
===================================================================
--- scummvm/trunk/gui/ThemeEngine.h 2010-11-05 10:31:36 UTC (rev 54089)
+++ scummvm/trunk/gui/ThemeEngine.h 2010-11-05 10:53:37 UTC (rev 54090)
@@ -32,7 +32,7 @@
#include "graphics/surface.h"
#include "graphics/font.h"
-#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.81"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.2"
namespace Graphics {
struct DrawStep;
Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp 2010-11-05 10:31:36 UTC (rev 54089)
+++ scummvm/trunk/gui/launcher.cpp 2010-11-05 10:53:37 UTC (rev 54090)
@@ -342,7 +342,7 @@
ConfMan.hasKey("render_mode", _domain) ||
ConfMan.hasKey("fullscreen", _domain) ||
ConfMan.hasKey("aspect_ratio", _domain) ||
- ConfMan.hasKey("sci_undither", _domain);
+ ConfMan.hasKey("disable_dithering", _domain);
_globalGraphicsOverride->setState(e);
e = ConfMan.hasKey("music_driver", _domain) ||
Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp 2010-11-05 10:31:36 UTC (rev 54089)
+++ scummvm/trunk/gui/options.cpp 2010-11-05 10:53:37 UTC (rev 54090)
@@ -98,7 +98,7 @@
_renderModePopUp = 0;
_fullscreenCheckbox = 0;
_aspectCheckbox = 0;
- _unditheringCheckbox = 0;
+ _disableDitheringCheckbox = 0;
_enableAudioSettings = false;
_midiPopUp = 0;
_oplPopUp = 0;
@@ -193,7 +193,7 @@
// Aspect ratio setting
_aspectCheckbox->setState(ConfMan.getBool("aspect_ratio", _domain));
#endif // SMALL_SCREEN_DEVICE
- _unditheringCheckbox->setState(ConfMan.getBool("sci_undither", _domain));
+ _disableDitheringCheckbox->setState(ConfMan.getBool("disable_dithering", _domain));
}
// Audio options
@@ -299,7 +299,7 @@
if (_enableGraphicSettings) {
ConfMan.setBool("fullscreen", _fullscreenCheckbox->getState(), _domain);
ConfMan.setBool("aspect_ratio", _aspectCheckbox->getState(), _domain);
- ConfMan.setBool("sci_undither", _unditheringCheckbox->getState(), _domain);
+ ConfMan.setBool("disable_dithering", _disableDitheringCheckbox->getState(), _domain);
bool isSet = false;
@@ -323,7 +323,7 @@
} else {
ConfMan.removeKey("fullscreen", _domain);
ConfMan.removeKey("aspect_ratio", _domain);
- ConfMan.removeKey("sci_undither", _domain);
+ ConfMan.removeKey("disable_dithering", _domain);
ConfMan.removeKey("gfx_mode", _domain);
ConfMan.removeKey("render_mode", _domain);
}
@@ -510,7 +510,7 @@
_fullscreenCheckbox->setEnabled(enabled);
_aspectCheckbox->setEnabled(enabled);
#endif
- _unditheringCheckbox->setEnabled(enabled);
+ _disableDitheringCheckbox->setEnabled(enabled);
}
void OptionsDialog::setAudioSettingsState(bool enabled) {
@@ -650,7 +650,7 @@
// Aspect ratio checkbox
_aspectCheckbox = new CheckboxWidget(boss, prefix + "grAspectCheckbox", _("Aspect ratio correction"), _("Correct aspect ratio for 320x200 games"));
- _unditheringCheckbox = new CheckboxWidget(boss, prefix + "grUnditherCheckbox", _("Remove SCI dithering"), _("Remove dithering artifacts from early SCI EGA games"));
+ _disableDitheringCheckbox = new CheckboxWidget(boss, prefix + "grDisableDitheringCheckbox", _("Disable EGA dithering"), _("Disable dithering artifacts from EGA games"));
_enableGraphicSettings = true;
}
Modified: scummvm/trunk/gui/options.h
===================================================================
--- scummvm/trunk/gui/options.h 2010-11-05 10:31:36 UTC (rev 54089)
+++ scummvm/trunk/gui/options.h 2010-11-05 10:53:37 UTC (rev 54090)
@@ -96,7 +96,7 @@
PopUpWidget *_gfxPopUp;
CheckboxWidget *_fullscreenCheckbox;
CheckboxWidget *_aspectCheckbox;
- CheckboxWidget *_unditheringCheckbox;
+ CheckboxWidget *_disableDitheringCheckbox;
StaticTextWidget *_renderModePopUpDesc;
PopUpWidget *_renderModePopUp;
Modified: scummvm/trunk/gui/themes/default.inc
===================================================================
--- scummvm/trunk/gui/themes/default.inc 2010-11-05 10:31:36 UTC (rev 54089)
+++ scummvm/trunk/gui/themes/default.inc 2010-11-05 10:53:37 UTC (rev 54090)
@@ -177,7 +177,7 @@
"<widget name='grFullscreenCheckbox' "
"type='Checkbox' "
"/> "
-"<widget name='grUnditherCheckbox' "
+"<widget name='grDisableDitheringCheckbox' "
"type='Checkbox' "
"/> "
"</layout> "
@@ -972,7 +972,7 @@
"<widget name='grFullscreenCheckbox' "
"type='Checkbox' "
"/> "
-"<widget name='grUnditherCheckbox' "
+"<widget name='grDisableDitheringCheckbox' "
"type='Checkbox' "
"/> "
"</layout> "
Modified: scummvm/trunk/gui/themes/scummclassic/THEMERC
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/THEMERC 2010-11-05 10:31:36 UTC (rev 54089)
+++ scummvm/trunk/gui/themes/scummclassic/THEMERC 2010-11-05 10:53:37 UTC (rev 54090)
@@ -1 +1 @@
-[SCUMMVM_STX0.81:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.8.2:ScummVM Classic Theme:No Author]
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2010-11-05 10:31:36 UTC (rev 54089)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2010-11-05 10:53:37 UTC (rev 54090)
@@ -218,7 +218,7 @@
<widget name = 'grFullscreenCheckbox'
type = 'Checkbox'
/>
- <widget name = 'grUnditherCheckbox'
+ <widget name = 'grDisableDitheringCheckbox'
type = 'Checkbox'
/>
</layout>
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx 2010-11-05 10:31:36 UTC (rev 54089)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx 2010-11-05 10:53:37 UTC (rev 54090)
@@ -216,7 +216,7 @@
<widget name = 'grFullscreenCheckbox'
type = 'Checkbox'
/>
- <widget name = 'grUnditherCheckbox'
+ <widget name = 'grDisableDitheringCheckbox'
type = 'Checkbox'
/>
</layout>
Modified: scummvm/trunk/gui/themes/scummclassic.zip
===================================================================
(Binary files differ)
Modified: scummvm/trunk/gui/themes/scummmodern/THEMERC
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/THEMERC 2010-11-05 10:31:36 UTC (rev 54089)
+++ scummvm/trunk/gui/themes/scummmodern/THEMERC 2010-11-05 10:53:37 UTC (rev 54090)
@@ -1 +1 @@
-[SCUMMVM_STX0.81:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.2:ScummVM Modern Theme:No Author]
Modified: scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx 2010-11-05 10:31:36 UTC (rev 54089)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx 2010-11-05 10:53:37 UTC (rev 54090)
@@ -233,7 +233,7 @@
<widget name = 'grFullscreenCheckbox'
type = 'Checkbox'
/>
- <widget name = 'grUnditherCheckbox'
+ <widget name = 'grDisableDitheringCheckbox'
type = 'Checkbox'
/>
</layout>
Modified: scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx 2010-11-05 10:31:36 UTC (rev 54089)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx 2010-11-05 10:53:37 UTC (rev 54090)
@@ -214,7 +214,7 @@
<widget name = 'grFullscreenCheckbox'
type = 'Checkbox'
/>
- <widget name = 'grUnditherCheckbox'
+ <widget name = 'grDisableDitheringCheckbox'
type = 'Checkbox'
/>
</layout>
Modified: scummvm/trunk/gui/themes/scummmodern.zip
===================================================================
(Binary files differ)
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