[Scummvm-git-logs] scummvm master -> 8d44cb05818e90d9a802cdf6a28b44093869ef6b

[dwatteau]

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

Summary:
8d44cb0581 AGOS: Keep clearing the surface when using `disable_fade_effects`


Commit: 8d44cb05818e90d9a802cdf6a28b44093869ef6b
    https://github.com/scummvm/scummvm/commit/8d44cb05818e90d9a802cdf6a28b44093869ef6b
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-09-24T18:19:06+02:00

Commit Message:
AGOS: Keep clearing the surface when using `disable_fade_effects`

When using this option with Simon 1, Simon wouldn't be cleared from the
bottom of the screen, if pressing Esc when Simon starts walking through
the screen right after the "Simon the Sorcerer" title is printed, at the
very beginning of the game.

Triggering the clearSurfaces() code even when _neverFade is enabled
solves this problem.

Fixes a mistake of mine in commit 802caa4c397266cc3a1f178b688f36ede91f7d2e.

Changed paths:
    engines/agos/vga_ww.cpp


diff --git a/engines/agos/vga_ww.cpp b/engines/agos/vga_ww.cpp
index 7ea6dee7f0f..15077160c85 100644
--- a/engines/agos/vga_ww.cpp
+++ b/engines/agos/vga_ww.cpp
@@ -230,7 +230,9 @@ void AGOSEngine::vc62_fastFadeOut() {
 			_system->getPaletteManager()->setPalette(_currentPalette, 0, _fastFadeCount);
 			delay(5);
 		}
+	}
 
+	if (!_fastFadeOutFlag) {
 		if (getGameType() == GType_WW || getGameType() == GType_FF || getGameType() == GType_PP) {
 			clearSurfaces();
 		} else {