[Scummvm-git-logs] scummvm master -> 24e3b1cf8652c9556466632628272f9a88030b0c

[dwatteau]

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

Summary:
24e3b1cf86 GRIM: Fix `COPY_*_LINE` macro use on strict-alignment ports


Commit: 24e3b1cf8652c9556466632628272f9a88030b0c
    https://github.com/scummvm/scummvm/commit/24e3b1cf8652c9556466632628272f9a88030b0c
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-11-29T11:47:33+01:00

Commit Message:
GRIM: Fix `COPY_*_LINE` macro use on strict-alignment ports

The macro for strict-alignment systems is SCUMM_NEED_ALIGNMENT, not
SYSTEM_NEED_ALIGNMENT.  Otherwise, the alignment-safe constructs were
not used, on such ports.

(See earlier commit 21fae5e42b232f399c7a7288e439524e74bde766.)

Found with UBSan.

Changed paths:
    engines/grim/movie/codecs/blocky8.cpp


diff --git a/engines/grim/movie/codecs/blocky8.cpp b/engines/grim/movie/codecs/blocky8.cpp
index 4bb4e46daf6..5ae66b151c5 100644
--- a/engines/grim/movie/codecs/blocky8.cpp
+++ b/engines/grim/movie/codecs/blocky8.cpp
@@ -27,7 +27,7 @@
 
 namespace Grim {
 
-#if defined(SYSTEM_NEED_ALIGNMENT)
+#if defined(SCUMM_NEED_ALIGNMENT)
 
 #define COPY_4X1_LINE(dst, src)			\
 	do {					\
@@ -44,7 +44,7 @@ namespace Grim {
 	} while (0)
 
 
-#else /* SYSTEM_NEED_ALIGNMENT */
+#else /* SCUMM_NEED_ALIGNMENT */
 
 #define COPY_4X1_LINE(dst, src)			\
 	*(uint32 *)(dst) = *(const uint32 *)(src)