[Scummvm-git-logs] scummvm master -> 147b84d6c67d1a40dfbfabbbd50d875026f70fa3

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


Commit: 147b84d6c67d1a40dfbfabbbd50d875026f70fa3
    https://github.com/scummvm/scummvm/commit/147b84d6c67d1a40dfbfabbbd50d875026f70fa3
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-12-03T18:42:28+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 59431fe3d0a..b57759935ba 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;