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

[bluegr]

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:
f202aea46f GLK: ALAN3: use ASIZE macro where applicable


Commit: f202aea46f223a193514169ec409d5e7a8567961
    https://github.com/scummvm/scummvm/commit/f202aea46f223a193514169ec409d5e7a8567961
Author: Michael Kuerbis (michael_kuerbis at web.de)
Date: 2026-08-11T22:09:29+03:00

Commit Message:
GLK: ALAN3: use ASIZE macro where applicable

Changed paths:
    engines/glk/alan3/main.cpp
    engines/glk/alan3/reverse.cpp
    engines/glk/alan3/types.h


diff --git a/engines/glk/alan3/main.cpp b/engines/glk/alan3/main.cpp
index 899568c2a43..c3c9d0d2454 100644
--- a/engines/glk/alan3/main.cpp
+++ b/engines/glk/alan3/main.cpp
@@ -118,11 +118,11 @@ Common::SeekableReadStream *codfil;
 static int crcStart(const byte version[4]) {
 	/* Some earlier versions had a shorter header */
 	if (isPreAlpha5(version))
-		return sizeof(Pre3_0alpha5Header) / sizeof(Aword);
+		return ASIZE(Pre3_0alpha5Header);
 	else if (isPreBeta2(version))
-		return sizeof(Pre3_0beta2Header) / sizeof(Aword);
+		return ASIZE(Pre3_0beta2Header);
 	else
-		return sizeof(ACodeHeader) / sizeof(Aword);
+		return ASIZE(ACodeHeader);
 }
 
 
@@ -357,7 +357,7 @@ static void load(CONTEXT) {
 	reverseHdr(&tmphdr);
 #endif
 
-	if (tmphdr.size <= sizeof(ACodeHeader) / sizeof(Aword))
+	if (tmphdr.size <= ASIZE(ACodeHeader))
 		syserr("Malformed game file. Too small.");
 
 	loadAndCheckMemory(tmphdr, crc, err);
diff --git a/engines/glk/alan3/reverse.cpp b/engines/glk/alan3/reverse.cpp
index a2e7a10cb46..89170f4227a 100644
--- a/engines/glk/alan3/reverse.cpp
+++ b/engines/glk/alan3/reverse.cpp
@@ -496,7 +496,7 @@ static void reversePreAlpha5Header(Pre3_0alpha5Header *hdr) {
 	uint i;
 
 	/* Reverse all words in the header except the tag */
-	for (i = 1; i < sizeof(*hdr) / sizeof(Aword); i++)
+	for (i = 1; i < ASIZE(*hdr); i++)
 		reverseWord(&((Aword *)hdr)[i]);
 }
 
@@ -536,7 +536,7 @@ static void reversePreBeta2Header(Pre3_0beta2Header *hdr) {
 	uint i;
 
 	/* Reverse all words in the header except the tag */
-	for (i = 1; i < sizeof(*hdr) / sizeof(Aword); i++)
+	for (i = 1; i < ASIZE(*hdr); i++)
 		reverseWord(&((Aword *)hdr)[i]);
 }
 
@@ -576,7 +576,7 @@ void reverseHdr(ACodeHeader *hdr) {
 	uint i;
 
 	/* Reverse all words in the header except the tag and the version marking */
-	for (i = 1; i < sizeof(*hdr) / sizeof(Aword); i++)
+	for (i = 1; i < ASIZE(*hdr); i++)
 		reverseWord(&((Aword *)hdr)[i]);
 }
 
diff --git a/engines/glk/alan3/types.h b/engines/glk/alan3/types.h
index 1d827ac2535..1b98f3d585f 100644
--- a/engines/glk/alan3/types.h
+++ b/engines/glk/alan3/types.h
@@ -52,7 +52,7 @@ namespace Alan3 {
 #define addressOf(x) ((((long)x)-((long)memory))/sizeof(Aword))
 #define stringAt(x) ((char *)pointerTo(x))
 
-#define ASIZE(x) (sizeof(x)/sizeof(Aword))
+#define ASIZE(x) AwordSizeOf(x)
 
 /* The various tables */
 struct VerbEntry {  /* VERB TABLE */