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

[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:
d3df5ca1c1 LASTEXPRESS: NIS: Make intro NIS render correctly on BE


Commit: d3df5ca1c1166a97e6165ba4eccaa6a734a5ffa9
    https://github.com/scummvm/scummvm/commit/d3df5ca1c1166a97e6165ba4eccaa6a734a5ffa9
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-06-19T17:43:35+02:00

Commit Message:
LASTEXPRESS: NIS: Make intro NIS render correctly on BE

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


diff --git a/engines/lastexpress/data/archive.cpp b/engines/lastexpress/data/archive.cpp
index b33f5b16a4a..487dd19878a 100644
--- a/engines/lastexpress/data/archive.cpp
+++ b/engines/lastexpress/data/archive.cpp
@@ -531,6 +531,10 @@ Seq *ArchiveManager::loadSeq(const char *filename, uint8 ticksToWaitUntilCycleRe
 	// sprite data...
 	uint16 *paletteAddr = (uint16 *)&seqDataRaw[8 + 68 * seq->numFrames]; 
 
+	for (int j = 0; j < 184; j++) {
+		paletteAddr[j] = FROM_LE_16(paletteAddr[j]);
+	}
+
 	_engine->getGraphicsManager()->modifyPalette(paletteAddr, 184);
 	return seq;
 }
@@ -541,6 +545,16 @@ void ArchiveManager::loadMice() {
 	if (archive) {
 		readHPF(archive, _engine->_cursorsMemoryPool, archive->size);
 		closeHPF(archive);
+
+		for (int i = 0; i < 0xC000; i++) {
+			_engine->getGraphicsManager()->_iconsBitmapData[i] = FROM_LE_16(_engine->getGraphicsManager()->_iconsBitmapData[i]);
+		}
+
+		for (int i = 0; i < 48; i++) {
+			_engine->getGraphicsManager()->_cursorsDataHeader->hotspotX = FROM_LE_16(_engine->getGraphicsManager()->_cursorsDataHeader->hotspotX);
+			_engine->getGraphicsManager()->_cursorsDataHeader->hotspotY = FROM_LE_16(_engine->getGraphicsManager()->_cursorsDataHeader->hotspotY);
+		}
+
 		_engine->getGraphicsManager()->modifyPalette(_engine->getGraphicsManager()->_iconsBitmapData, 0xC000);
 	}
 }
diff --git a/engines/lastexpress/game/nis.cpp b/engines/lastexpress/game/nis.cpp
index 6dc2a972096..6d8ea4aa761 100644
--- a/engines/lastexpress/game/nis.cpp
+++ b/engines/lastexpress/game/nis.cpp
@@ -79,10 +79,13 @@ void NISManager::convertNSPR16(byte *spriteData, NisSprite *outSprite) {
 	WRITE_LE_UINT16(&outSprite->colorPalette[0], 0);
 	WRITE_LE_UINT16(&outSprite->colorPalette[1], 0);
 
+	for (int i = 0; i < 128; ++i)
+		outSprite->colorPalette[i] = FROM_LE_16(outSprite->colorPalette[i]);
+
 	_engine->getGraphicsManager()->modifyPalette((uint16 *)outSprite->colorPalette, 128);
 
 	for (int i = 0; i < 128; i++)
-		outSprite->gammaPalette[i] = READ_LE_UINT16(spriteData + 2 * i + 36);
+		outSprite->gammaPalette[i] = READ_UINT16(spriteData + 2 * i + 36);
 
 	outSprite->compBits = spriteData[2 * 128 + 36];
 
diff --git a/engines/lastexpress/sound/sound.cpp b/engines/lastexpress/sound/sound.cpp
index d8c64b701a6..aa3f6a9b71d 100644
--- a/engines/lastexpress/sound/sound.cpp
+++ b/engines/lastexpress/sound/sound.cpp
@@ -237,8 +237,8 @@ void SoundManager::ambientAI(int id) {
 	byte numLoops[9] = {0, 4, 2, 2, 2, 2, 2, 0, 0};
 
 	int positions[8] = {
-		kPosition_8200, kPosition_7500, kPosition_6470, kPosition_5790,
-		kPosition_4840, kPosition_4070, kPosition_3050, kPosition_2740
+		8200, 7500, 6470, 5790,
+		4840, 4070, 3050, 2740
 	};
 
 	char newAmbientSoundName[80];