[Scummvm-git-logs] scummvm master -> 3927fd8ef14d5ac0d15ae0df3cf7a6a11a485e9d

[dwatteau]

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

Summary:
b1e08f3f52 SCUMM: Fix typo in variable name in previous fix
3927fd8ef1 SCUMM: Fix DISABLE_TOWNS_DUAL_LAYER_MODE builds


Commit: b1e08f3f5242a322e8c7ca990d9411c74666d61a
    https://github.com/scummvm/scummvm/commit/b1e08f3f5242a322e8c7ca990d9411c74666d61a
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-07-30T13:45:44+02:00

Commit Message:
SCUMM: Fix typo in variable name in previous fix

Changed paths:
    engines/scumm/gfx.cpp


diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index a0af863f5c4..f6120f01a9a 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -4276,7 +4276,7 @@ void ScummEngine::dissolveEffect(int width, int height) {
 				if (is1x1Pattern) {
 					*_compositeBuf = *src;
 				} else {
-					for (int ii = 0; ii < height; ++i) {
+					for (int ii = 0; ii < height; ++ii) {
 						memcpy(_compositeBuf + width * ii, src, width);
 						src += pitch;
 					}


Commit: 3927fd8ef14d5ac0d15ae0df3cf7a6a11a485e9d
    https://github.com/scummvm/scummvm/commit/3927fd8ef14d5ac0d15ae0df3cf7a6a11a485e9d
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-07-30T13:47:07+02:00

Commit Message:
SCUMM: Fix DISABLE_TOWNS_DUAL_LAYER_MODE builds

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 064f8816708..353ed881468 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2886,10 +2886,12 @@ void ScummEngine::restart() {
 	_currentScript = 0xFF;
 	killAllScriptsExceptCurrent();
 
+#ifndef DISABLE_TOWNS_DUAL_LAYER_MODE
 	if (_townsScreen && _game.id == GID_MONKEY) {
 		_textSurface.fillRect(Common::Rect(0, 0, _textSurface.w * _textSurfaceMultiplier, _textSurface.h * _textSurfaceMultiplier), 0);
 		_townsScreen->clearLayer(1);
 	}
+#endif
 
 	setShake(0);
 	_sound->stopAllSounds();