[Scummvm-git-logs] scummvm master -> b606509034654953cf50ad91ebf3b0da01f96b89

[bluegr]

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:
b606509034 SCI32: Update comments concerning the kShowStyleNone change in Hoyle 5


Commit: b606509034654953cf50ad91ebf3b0da01f96b89
    https://github.com/scummvm/scummvm/commit/b606509034654953cf50ad91ebf3b0da01f96b89
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-10-17T20:28:09+03:00

Commit Message:
SCI32: Update comments concerning the kShowStyleNone change in Hoyle 5

Turns out that this was one of the interpreters where Sierra actually
changed the transition code for fading in/out, so don't mark it as a
hack anymore. Thanks to @sluicebox for his help on verifying this one

Changed paths:
    engines/sci/graphics/transitions32.cpp


diff --git a/engines/sci/graphics/transitions32.cpp b/engines/sci/graphics/transitions32.cpp
index 7b9ac9e63e..ddbce810cf 100644
--- a/engines/sci/graphics/transitions32.cpp
+++ b/engines/sci/graphics/transitions32.cpp
@@ -260,15 +260,12 @@ void GfxTransitions32::kernelSetShowStyle(const uint16 argc, const reg_t planeOb
 
 		// Do not add kShowStyleNone types to the showStyles list.
 		//
-		// HACK: Hoyle 5 does a fade out in some screens, and then makes a
-		// kShowStyleNone call to enter the new screen, without a fade in,
-		// thus leaving the whole screen black. By removing ths return,
-		// the code for queuing the kShowStyleNone calls is enabled, and this
-		// wrong behavior is fixed, as the screen palette is restored in the
-		// processNone() call inside processShowStyle(). I wasn't able to find
-		// any other notable difference in the graphics code of the Hoyle 5
-		// interpreter, and disabling this return has no other ill effects for
-		// this game, so this will suffice for now.
+		// This return was removed in some interpreters, notably the Windows
+		// version of Hoyle 5. In this version, a fade out is done and then
+		// kShowStyleNone is called to enter the new screen without a fade in.
+		// In such cases, we should not return here, so that the code for
+		// queuing kShowStyleNone calls is enabled and the screen palette is
+		// restored in the processNone() call inside processShowStyle().
 		if (g_sci->getGameId() != GID_HOYLE5)
 			return;
 	}