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

[AndywinXp]

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:
cdabda2477 SCUMM: GFX: Set correct fadeout transition when restarting game


Commit: cdabda2477d16ca8a099c36b5af5bf3a7839e4ca
    https://github.com/scummvm/scummvm/commit/cdabda2477d16ca8a099c36b5af5bf3a7839e4ca
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-11-13T20:37:13+01:00

Commit Message:
SCUMM: GFX: Set correct fadeout transition when restarting game

Changed paths:
    engines/scumm/gfx_gui.cpp


diff --git a/engines/scumm/gfx_gui.cpp b/engines/scumm/gfx_gui.cpp
index b3061cfaf57..3159868049a 100644
--- a/engines/scumm/gfx_gui.cpp
+++ b/engines/scumm/gfx_gui.cpp
@@ -2129,8 +2129,36 @@ void ScummEngine::queryRestart() {
 			if (_game.version < 5)
 				restoreCharsetBg();
 
-			if (_game.id == GID_SAMNMAX)
-				fadeOut(134);
+			int fadeOutType;
+			switch (_game.id) {
+			case GID_MANIAC:
+			case GID_ZAK:
+			case GID_INDY3:
+				fadeOutType = 1;
+				break;
+			case GID_LOOM:
+				fadeOutType = _game.version == 4 ? 134 : -1;
+				break;
+			case GID_MONKEY:
+			case GID_MONKEY2:
+			case GID_INDY4:
+			case GID_TENTACLE:
+			case GID_SAMNMAX:
+				fadeOutType = 134;
+				break;
+			case GID_FT:
+			case GID_DIG:
+				fadeOutType = -1;
+				break;
+			case GID_MONKEY_EGA:
+				fadeOutType = 128;
+				break;
+			default:
+				fadeOutType = 129;
+			}
+
+			if (fadeOutType != -1)
+				fadeOut(fadeOutType);
 
 			restart();
 		}