[Scummvm-git-logs] scummvm branch-2-9 -> 852cebbc9b91a36526bc6ce65ece604958b92e87

[eriktorbjorn]

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:
852cebbc9b SCUMM: Fix Mac MI2 scrollEffect() crash (bug #6286)


Commit: 852cebbc9b91a36526bc6ce65ece604958b92e87
    https://github.com/scummvm/scummvm/commit/852cebbc9b91a36526bc6ce65ece604958b92e87
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-12-03T18:44:31+01:00

Commit Message:
SCUMM: Fix Mac MI2 scrollEffect() crash (bug #6286)

This only happened when the original GUI was disabled.

Changed paths:
    engines/scumm/gfx.cpp


diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index ec1c5cc6191..c64c5d1a97b 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -4803,7 +4803,7 @@ void ScummEngine::scrollEffect(int dir) {
 	byte *src;
 	int m = _textSurfaceMultiplier;
 
-	if (m == 1 && _game.platform == Common::kPlatformMacintosh)
+	if (m == 1 && _game.platform == Common::kPlatformMacintosh && _macScreen)
 		m = 2;
 
 	int vsPitch = vs->pitch;