[Scummvm-git-logs] scummvm master -> 1e6e1c60f8c8a8b0ebd3ff42e178613f824767a9

[athrxx]

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:
1e6e1c60f8 SCUMM: fix warning


Commit: 1e6e1c60f8c8a8b0ebd3ff42e178613f824767a9
    https://github.com/scummvm/scummvm/commit/1e6e1c60f8c8a8b0ebd3ff42e178613f824767a9
Author: athrxx (athrxx at scummvm.org)
Date: 2022-07-29T20:43:50+02:00

Commit Message:
SCUMM: fix warning

Changed paths:
    engines/scumm/gfx.cpp


diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 077f14b7a4b..a0af863f5c4 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -4273,11 +4273,11 @@ void ScummEngine::dissolveEffect(int width, int height) {
 			int ht = height;
 
 			if (_enableEGADithering) {
-				if (width == 1 && height == 1) {
+				if (is1x1Pattern) {
 					*_compositeBuf = *src;
 				} else {
-					for (int i = 0; i < height; ++i) {
-						memcpy(_compositeBuf + width * i, src, width);
+					for (int ii = 0; ii < height; ++i) {
+						memcpy(_compositeBuf + width * ii, src, width);
 						src += pitch;
 					}
 				}