[Scummvm-git-logs] scummvm master -> 995dcaf1909287a9392b7fd39b467bd2981c23db

[neuromancer]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
36bc8b8c31 FREESCAPE: removed duplicated code that cased a crash
995dcaf190 FREESCAPE: added some digitalized sounds for eclipse for atari st


Commit: 36bc8b8c31a9f14e02d4d4e41c5810b5772f2a87
    https://github.com/scummvm/scummvm/commit/36bc8b8c31a9f14e02d4d4e41c5810b5772f2a87
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-06-07T12:44:15+02:00

Commit Message:
FREESCAPE: removed duplicated code that cased a crash

Changed paths:
    engines/freescape/games/dark/zx.cpp


diff --git a/engines/freescape/games/dark/zx.cpp b/engines/freescape/games/dark/zx.cpp
index d92048f42f2..547b3182a1f 100644
--- a/engines/freescape/games/dark/zx.cpp
+++ b/engines/freescape/games/dark/zx.cpp
@@ -59,11 +59,6 @@ void DarkEngine::loadAssetsZXFullGame() {
 	loadFonts(&file, 0x5d60 - 6, _font);
 	loadGlobalObjects(&file, 0x1a, 23);
 	load8bitBinary(&file, 0x5ec0 - 4, 4);
-	for (auto &it : _areaMap) {
-		addWalls(it._value);
-		addECDs(it._value);
-		addSkanner(it._value);
-	}
 	loadSpeakerFxZX(&file, 0x9c1, 0xa55);
 
 	_indicators.push_back(loadBundledImage("dark_fallen_indicator"));
@@ -103,12 +98,6 @@ void DarkEngine::loadAssetsZXDemo() {
 	loadFonts(&file, 0x6164, _font);
 	loadGlobalObjects(&file, 0x20, 23);
 	load8bitBinary(&file, 0x62c6, 4);
-	for (auto &it : _areaMap) {
-		addWalls(it._value);
-		addECDs(it._value);
-		addSkanner(it._value);
-	}
-
 	_indicators.push_back(loadBundledImage("dark_fallen_indicator"));
 	_indicators.push_back(loadBundledImage("dark_crouch_indicator"));
 	_indicators.push_back(loadBundledImage("dark_walk_indicator"));


Commit: 995dcaf1909287a9392b7fd39b467bd2981c23db
    https://github.com/scummvm/scummvm/commit/995dcaf1909287a9392b7fd39b467bd2981c23db
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-06-07T12:44:15+02:00

Commit Message:
FREESCAPE: added some digitalized sounds for eclipse for atari st

Changed paths:
    engines/freescape/games/eclipse/atari.cpp
    engines/freescape/games/eclipse/dos.cpp
    engines/freescape/sound.cpp


diff --git a/engines/freescape/games/eclipse/atari.cpp b/engines/freescape/games/eclipse/atari.cpp
index 8e878191424..d419f86778d 100644
--- a/engines/freescape/games/eclipse/atari.cpp
+++ b/engines/freescape/games/eclipse/atari.cpp
@@ -167,6 +167,7 @@ void EclipseEngine::loadAssetsAtariFullGame() {
 
 	_border = loadAndConvertNeoImage(stream, 0x139c8);
 	loadPalettes(stream, 0x2a0fa);
+	loadSoundsFx(stream, 0x3030c, 6);
 
 	for (auto &it : _areaMap) {
 		it._value->addStructure(_areaMap[255]);
diff --git a/engines/freescape/games/eclipse/dos.cpp b/engines/freescape/games/eclipse/dos.cpp
index 06dfb8196a8..6d1b94a5178 100644
--- a/engines/freescape/games/eclipse/dos.cpp
+++ b/engines/freescape/games/eclipse/dos.cpp
@@ -213,6 +213,11 @@ soundFx *EclipseEngine::load1bPCM(Common::SeekableReadStream *file, int offset)
 }
 
 void EclipseEngine::loadSoundsFx(Common::SeekableReadStream *file, int offset, int number) {
+	if (isAmiga() || isAtariST()) {
+		FreescapeEngine::loadSoundsFx(file, offset, number);
+		return;
+	}
+
 	for (int i = 0; i < 5; i++) {
 		_soundsFx[i] = load1bPCM(file, offset);
 		offset += (_soundsFx[i]->size / 8) + 4;
@@ -221,6 +226,11 @@ void EclipseEngine::loadSoundsFx(Common::SeekableReadStream *file, int offset, i
 
 
 void EclipseEngine::playSoundFx(int index, bool sync) {
+	if (isAmiga() || isAtariST()) {
+		FreescapeEngine::playSoundFx(index, sync);
+		return;
+	}
+
 	if (_soundsFx.size() == 0) {
 		debugC(1, kFreescapeDebugMedia, "WARNING: Sounds are not loaded");
 		return;
diff --git a/engines/freescape/sound.cpp b/engines/freescape/sound.cpp
index 5ab6b0bfa06..8281151b836 100644
--- a/engines/freescape/sound.cpp
+++ b/engines/freescape/sound.cpp
@@ -530,7 +530,7 @@ void FreescapeEngine::loadSoundsFx(Common::SeekableReadStream *file, int offset,
 		assert(zero == 0);
 		int size = file->readUint16BE();
 		int sampleRate = file->readUint16BE();
-		debugC(1, kFreescapeDebugParser, "Loading sound: %d (size: %d, sample rate: %d)", i, size, sampleRate);
+		debugC(1, kFreescapeDebugParser, "Loading sound: %d (size: %d, sample rate: %d) at %lx", i, size, sampleRate, file->pos());
 		byte *data = (byte *)malloc(size * sizeof(byte));
 		file->read(data, size);
 		sound->sampleRate = sampleRate;