[Scummvm-git-logs] scummvm master -> 2c67df8ffc85c359496287938395833ddb0aab26

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
802caa4c39 AGOS: Add an option to disable the fade-out effects in Simon1/Simon2
2c67df8ffc DOCS: Describe new AGOS disable_fade_effects option


Commit: 802caa4c397266cc3a1f178b688f36ede91f7d2e
    https://github.com/scummvm/scummvm/commit/802caa4c397266cc3a1f178b688f36ede91f7d2e
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-06-23T20:28:34+02:00

Commit Message:
AGOS: Add an option to disable the fade-out effects in Simon1/Simon2

Simon1 and Simon2 fade the screen to black whenever leaving a room,
but this can be slow to render on some devices, and for some people
nowadays it can really make the pace of the game quite slow.

Changed paths:
    engines/agos/agos.cpp
    engines/agos/agos.h
    engines/agos/detection.cpp
    engines/agos/vga_ww.cpp


diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 9e5e6a3d917..8d4a1f3aa54 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -371,7 +371,8 @@ AGOSEngine::AGOSEngine(OSystem *system, const AGOSGameDescription *gd)
 
 	_fastFadeCount = 0;
 	_fastFadeInFlag = 0;
-	_fastFadeOutFlag = 0;
+	_fastFadeOutFlag = false;
+	_neverFade = false;
 	_exitCutscene = 0;
 	_paletteFlag = 0;
 	_bottomPalette = false;
@@ -603,6 +604,9 @@ Common::Error AGOSEngine::init() {
 		_internalHeight <<= 1;
 	}
 
+	if (ConfMan.hasKey("disable_fade_effects"))
+		_neverFade = ConfMan.getBool("disable_fade_effects");
+
 	initGraphics(_internalWidth, _internalHeight);
 
 	_midi = new MidiPlayer(this);
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 0a2e16f6ccc..d02b6c58d58 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -454,6 +454,7 @@ protected:
 	bool _bottomPalette;
 	uint16 _fastFadeCount;
 	volatile uint16 _fastFadeInFlag;
+	bool _neverFade;
 
 	uint16 _screenWidth, _screenHeight;
 	uint16 _internalWidth, _internalHeight;
diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index 2a920794680..0c61a6083cd 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/detection.cpp
@@ -100,6 +100,15 @@ static const ExtraGuiOption preferDigitalSfx = {
 	0
 };
 
+static const ExtraGuiOption disableFadeEffects = {
+	_s("Disable fade-out effects"),
+	_s("Don't fade every screen to black when leaving a room."),
+	"disable_fade_effects",
+	false,
+	0,
+	0
+};
+
 class AgosMetaEngineDetection : public AdvancedMetaEngineDetection {
 public:
 	AgosMetaEngineDetection() : AdvancedMetaEngineDetection(AGOS::gameDescriptions, sizeof(AGOS::AGOSGameDescription), agosGames) {
@@ -154,6 +163,9 @@ public:
 			// digital SFX.
 			options.push_back(preferDigitalSfx);
 		}
+		if (target.empty() || gameid == "simon1" || gameid == "simon2") {
+			options.push_back(disableFadeEffects);
+		}
 		return options;
 	}
 };
diff --git a/engines/agos/vga_ww.cpp b/engines/agos/vga_ww.cpp
index 4decf54fd5f..7ea6dee7f0f 100644
--- a/engines/agos/vga_ww.cpp
+++ b/engines/agos/vga_ww.cpp
@@ -197,8 +197,8 @@ void AGOSEngine::vc61() {
 
 void AGOSEngine::vc62_fastFadeOut() {
 	vc29_stopAllSounds();
-	
-	if (!_fastFadeOutFlag) {
+
+	if (!_neverFade && !_fastFadeOutFlag) {
 		uint i, fadeSize, fadeCount;
 
 		_fastFadeCount = 256;


Commit: 2c67df8ffc85c359496287938395833ddb0aab26
    https://github.com/scummvm/scummvm/commit/2c67df8ffc85c359496287938395833ddb0aab26
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-06-23T20:28:34+02:00

Commit Message:
DOCS: Describe new AGOS disable_fade_effects option

Changed paths:
    doc/docportal/settings/engine.rst


diff --git a/doc/docportal/settings/engine.rst b/doc/docportal/settings/engine.rst
index 682f44233af..a051a111a1d 100644
--- a/doc/docportal/settings/engine.rst
+++ b/doc/docportal/settings/engine.rst
@@ -9,7 +9,7 @@ From the Launcher, highlight a game on the games list, select **Edit Game**, and
 To find out which engine powers your game, have a look at the ScummVM Supported Games `wiki page
 <https://wiki.scummvm.org/index.php?title=Category:Supported_Games>`_.
 
-Engines: ADL_ | AGI_ | BLADERUNNER_ | CGE_ | CINE_ | DRASCULA_ | DREAMWEB_ | HDB_ | HOPKINS_ | KYRA_ | LURE_ | MADS_ | NEVERHOOD_ | SCI_ | SCUMM_ | SHERLOCK_ | SKY_ | SUPERNOVA_ | TOLTECS_ | WINTERMUTE_ | XEEN_ |
+Engines: ADL_ | AGI_ | AGOS_ | BLADERUNNER_ | CGE_ | CINE_ | DRASCULA_ | DREAMWEB_ | HDB_ | HOPKINS_ | KYRA_ | LURE_ | MADS_ | NEVERHOOD_ | SCI_ | SCUMM_ | SHERLOCK_ | SKY_ | SUPERNOVA_ | TOLTECS_ | WINTERMUTE_ | XEEN_ |
 
 .. figure:: ../images/settings/engine.png
 
@@ -103,6 +103,20 @@ Add speed menu
 
 ,,,,,,
 
+.. _AGOS:
+
+AGOS
+******
+
+.. _fadeout:
+
+Disable fade-out effects
+	Don't fade every screen to black when leaving a room.
+
+	*disable_fade_effects*
+
+,,,,,,
+
 .. _BLADERUNNER:
 
 BLADERUNNER