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

[AndywinXp]

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:
b19e07f324 LASTEXPRESS: GFX: Endianness fixes


Commit: b19e07f3242ee93660d883a4cb75ee6f665885b3
    https://github.com/scummvm/scummvm/commit/b19e07f3242ee93660d883a4cb75ee6f665885b3
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-06-19T15:09:53+02:00

Commit Message:
LASTEXPRESS: GFX: Endianness fixes

Changed paths:
    engines/lastexpress/data/cvcrfile.cpp
    engines/lastexpress/graphics.cpp


diff --git a/engines/lastexpress/data/cvcrfile.cpp b/engines/lastexpress/data/cvcrfile.cpp
index 3682ac69068..f0308c45d44 100644
--- a/engines/lastexpress/data/cvcrfile.cpp
+++ b/engines/lastexpress/data/cvcrfile.cpp
@@ -718,6 +718,4 @@ int32 CVCRFile::tell() {
 	}
 }
 
-
-
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/graphics.cpp b/engines/lastexpress/graphics.cpp
index 2f0a6667557..04f14a42afb 100644
--- a/engines/lastexpress/graphics.cpp
+++ b/engines/lastexpress/graphics.cpp
@@ -276,7 +276,7 @@ void GraphicsManager::bitBltSprite255(Sprite *sprite, PixMap *pixels) {
 	destEndPtr = pixels + (640 * 480);
 
 	while (destPtr < destEndPtr) {
-		cmd = *(uint16 *)compressedData;
+		cmd = FROM_LE_16(*(uint16 *)compressedData);
 
 		// Direct color lookup
 		if ((cmd & 0xFF) < 0x80) {
@@ -1709,13 +1709,13 @@ void GraphicsManager::doErase(byte *data) {
 
 	// Apply the old screen buffer on the erase mask
 	do {
-		if (*eraseMask) {
-			memcpy(screenSurface, previousScreenBuffer, 4 * *eraseMask);
-			previousScreenBuffer += 4 * *eraseMask;
-			screenSurface += 4 * *eraseMask;
+		if (FROM_LE_16(*eraseMask)) {
+			memcpy(screenSurface, previousScreenBuffer, 4 * FROM_LE_16(*eraseMask));
+			previousScreenBuffer += 4 * FROM_LE_16(*eraseMask);
+			screenSurface += 4 * FROM_LE_16(*eraseMask);
 		}
 	
-		int skipSize = *(eraseMask + 1) << 2;
+		int skipSize = FROM_LE_16(*(eraseMask + 1)) << 2;
 		screenSurface += skipSize;
 		previousScreenBuffer += skipSize;
 		eraseMask += 2;
@@ -1926,7 +1926,7 @@ void GraphicsManager::decompG(byte *data, int32 size) {
 
 			// Copy green component (bits 5-9) from previous output
 			for (int i = 0; i < count; i++) {
-				*((int16 *)outBuffer) |= (*sourcePtr & 0x3E0);
+				*((int16 *)outBuffer) |= (FROM_LE_16(*sourcePtr) & 0x3E0);
 				outBuffer += 2;
 				sourcePtr++;
 			}