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

[dwatteau]

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:
e6bbf2636d SCUMM: Silence -Wextra warning from GCC in ScummEngine::scrollEffect()


Commit: e6bbf2636d065f79002e20b782b2ed1adb1b174d
    https://github.com/scummvm/scummvm/commit/e6bbf2636d065f79002e20b782b2ed1adb1b174d
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-03T12:53:17+02:00

Commit Message:
SCUMM: Silence -Wextra warning from GCC in ScummEngine::scrollEffect()

This gives an "enumerated and non-enumerated type in conditional expression"
warning with GCC 11.3, but everything's OK in this context.

Changed paths:
    engines/scumm/gfx.cpp


diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index c7c3a5c1a81..2ded2ab1f49 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -4589,7 +4589,7 @@ void ScummEngine::scrollEffect(int dir) {
 
 	// Keep in mind: this effect is only present in v5 and v6, so VAR_FADE_DELAY is
 	// never uninitialized. The following check is here for good measure only.
-	int delay = (VAR_FADE_DELAY != 0xFF) ? VAR(VAR_FADE_DELAY) : kPictureDelay;
+	int delay = (VAR_FADE_DELAY != 0xFF) ? VAR(VAR_FADE_DELAY) : (int)kPictureDelay;
 
 	// Amiga handles timing a whole frame at a time
 	// instead of using quarter frames; the following