[Scummvm-git-logs] scummvm master -> 9a78bc339c6a06a86484ab529ac77c4cbd3d824e

[antoniou79]

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:
9a78bc339c BLADERUNNER: Get rid of -Wcast-align warning


Commit: 9a78bc339c6a06a86484ab529ac77c4cbd3d824e
    https://github.com/scummvm/scummvm/commit/9a78bc339c6a06a86484ab529ac77c4cbd3d824e
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-08-19T20:06:03+03:00

Commit Message:
BLADERUNNER: Get rid of -Wcast-align warning

Changed paths:
    engines/bladerunner/zbuffer.cpp


diff --git a/engines/bladerunner/zbuffer.cpp b/engines/bladerunner/zbuffer.cpp
index b80882f9c87..b53a7d09937 100644
--- a/engines/bladerunner/zbuffer.cpp
+++ b/engines/bladerunner/zbuffer.cpp
@@ -98,17 +98,19 @@ static int decodePartialZBuffer(const uint8 *src, uint16 *curZBUF, uint32 srcLen
 	uint32 dstRemain = dstSize;
 
 	uint16 *curzp = curZBUF;
-	const uint16 *inp = (const uint16 *)src;
+	const uint8 *inp8 = src;
 
-	while (dstRemain && (inp - (const uint16 *)src) < (ptrdiff_t)srcLen) {
-		uint32 count = FROM_LE_16(*inp++);
+	while (dstRemain && (inp8 - src) < (ptrdiff_t)srcLen) {
+		uint32 count = READ_LE_UINT16(inp8);
+		inp8+=2;
 
 		if (count & 0x8000) {
 			count = MIN(count & 0x7fff, dstRemain);
 			dstRemain -= count;
 
 			while (count--) {
-				uint16 value = FROM_LE_16(*inp++);
+				uint16 value = READ_LE_UINT16(inp8);
+				inp8+=2;
 				if (value)
 					*curzp = value;
 				++curzp;
@@ -116,7 +118,8 @@ static int decodePartialZBuffer(const uint8 *src, uint16 *curZBUF, uint32 srcLen
 		} else {
 			count = MIN(count, dstRemain);
 			dstRemain -= count;
-			uint16 value = FROM_LE_16(*inp++);
+			uint16 value = READ_LE_UINT16(inp8);
+			inp8+=2;
 
 			if (!value) {
 				curzp += count;