[Scummvm-git-logs] scummvm master -> 410dd6cd2c73fdca8022ec583844590f0f6d3318

[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:
410dd6cd2c LASTEXPRESS: Substitute FROM_LE_* with READ_LE_*


Commit: 410dd6cd2c73fdca8022ec583844590f0f6d3318
    https://github.com/scummvm/scummvm/commit/410dd6cd2c73fdca8022ec583844590f0f6d3318
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-06-19T21:34:50+02:00

Commit Message:
LASTEXPRESS: Substitute FROM_LE_* with READ_LE_*

This impacts previous endianness changes.

Changed paths:
    engines/lastexpress/data/archive.cpp
    engines/lastexpress/game/nis.cpp
    engines/lastexpress/graphics.cpp


diff --git a/engines/lastexpress/data/archive.cpp b/engines/lastexpress/data/archive.cpp
index 487dd19878a..df8a9a5e6e6 100644
--- a/engines/lastexpress/data/archive.cpp
+++ b/engines/lastexpress/data/archive.cpp
@@ -532,7 +532,7 @@ Seq *ArchiveManager::loadSeq(const char *filename, uint8 ticksToWaitUntilCycleRe
 	uint16 *paletteAddr = (uint16 *)&seqDataRaw[8 + 68 * seq->numFrames]; 
 
 	for (int j = 0; j < 184; j++) {
-		paletteAddr[j] = FROM_LE_16(paletteAddr[j]);
+		paletteAddr[j] = READ_LE_UINT16(&paletteAddr[j]);
 	}
 
 	_engine->getGraphicsManager()->modifyPalette(paletteAddr, 184);
diff --git a/engines/lastexpress/game/nis.cpp b/engines/lastexpress/game/nis.cpp
index 6d8ea4aa761..4cf9e7495cb 100644
--- a/engines/lastexpress/game/nis.cpp
+++ b/engines/lastexpress/game/nis.cpp
@@ -80,7 +80,7 @@ void NISManager::convertNSPR16(byte *spriteData, NisSprite *outSprite) {
 	WRITE_LE_UINT16(&outSprite->colorPalette[1], 0);
 
 	for (int i = 0; i < 128; ++i)
-		outSprite->colorPalette[i] = FROM_LE_16(outSprite->colorPalette[i]);
+		outSprite->colorPalette[i] = READ_LE_UINT16(&outSprite->colorPalette[i]);
 
 	_engine->getGraphicsManager()->modifyPalette((uint16 *)outSprite->colorPalette, 128);
 
@@ -228,17 +228,17 @@ bool NISManager::initNIS(const char *filename, int32 flags) {
 	_engine->getMemoryManager()->lockSeqMem((_totalBackgroundPages - 300) * PAGE_SIZE);
 	getStream((byte *)&_eventsCount, 4);
 
-	_eventsCount = FROM_LE_32(_eventsCount);
+	_eventsCount = READ_LE_INT32(&_eventsCount);
 
 	_eventsByteStream = (byte *)(_backgroundSurface + 2);
 
-	_background1Offset = FROM_LE_32(*((int32 *)_backgroundSurface + 2));
+	_background1Offset = READ_LE_INT32((int32 *)_backgroundSurface + 2);
 	_background1Offset += 16;
 	_background1Offset &= 0xFFFFFFF0;
 	_streamBufferSize -= _background1Offset;
 	_background1ByteStream = (byte *)((byte *)_backgroundSurface + _streamBufferSize);
 
-	_waneSpriteOffset = FROM_LE_32(*((int32 *)_backgroundSurface + 4));
+	_waneSpriteOffset = READ_LE_INT32((int32 *)_backgroundSurface + 4);
 	_waneSpriteOffset += 16;
 	_waneSpriteOffset &= 0xFFFFFFF0;
 	_streamBufferSize -= _waneSpriteOffset;
@@ -908,7 +908,7 @@ void NISManager::processNIS(NisEvents *event) {
 
 		if ((_flags & kNisFlagSoundInitialized) == 0) {
 			_flags |= kNisFlagSoundInitialized;
-			_currentNISSound->setBlockCount(FROM_LE_16(*((uint16 *)_currentNISSound->getDataStart() + 2) - 1));
+			_currentNISSound->setBlockCount(READ_LE_UINT16((uint16 *)_currentNISSound->getDataStart() + 2) - 1);
 			_currentNISSound->setSize(0x16000);
 		}
 
diff --git a/engines/lastexpress/graphics.cpp b/engines/lastexpress/graphics.cpp
index 04f14a42afb..96e8f6cee70 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 = FROM_LE_16(*(uint16 *)compressedData);
+		cmd = READ_LE_UINT16((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 (FROM_LE_16(*eraseMask)) {
-			memcpy(screenSurface, previousScreenBuffer, 4 * FROM_LE_16(*eraseMask));
-			previousScreenBuffer += 4 * FROM_LE_16(*eraseMask);
-			screenSurface += 4 * FROM_LE_16(*eraseMask);
+		if (READ_LE_UINT16(eraseMask)) {
+			memcpy(screenSurface, previousScreenBuffer, 4 * READ_LE_UINT16(eraseMask));
+			previousScreenBuffer += 4 * READ_LE_UINT16(eraseMask);
+			screenSurface += 4 * READ_LE_UINT16(eraseMask);
 		}
 	
-		int skipSize = FROM_LE_16(*(eraseMask + 1)) << 2;
+		int skipSize = READ_LE_UINT16(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) |= (FROM_LE_16(*sourcePtr) & 0x3E0);
+				*((int16 *)outBuffer) |= (READ_LE_INT16(sourcePtr) & 0x3E0);
 				outBuffer += 2;
 				sourcePtr++;
 			}