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

[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:
adc69ac7e7 FREESCAPE: added some missing sounds in driller and eclipse
db6a6476f2 HYPNO: fixed crash when loading the fonts for some hypno games


Commit: adc69ac7e797b23426a94c54f543f0c1f1e84002
    https://github.com/scummvm/scummvm/commit/adc69ac7e797b23426a94c54f543f0c1f1e84002
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-08-14T10:42:22+02:00

Commit Message:
FREESCAPE: added some missing sounds in driller and eclipse

Changed paths:
    engines/freescape/games/driller/zx.cpp
    engines/freescape/games/eclipse/eclipse.cpp


diff --git a/engines/freescape/games/driller/zx.cpp b/engines/freescape/games/driller/zx.cpp
index 95abcca07b8..4de92def650 100644
--- a/engines/freescape/games/driller/zx.cpp
+++ b/engines/freescape/games/driller/zx.cpp
@@ -28,6 +28,7 @@ namespace Freescape {
 
 void DrillerEngine::initZX() {
 	_viewArea = Common::Rect(56, 20, 264, 124);
+	_soundIndexAreaChange = 10;
 }
 
 void DrillerEngine::loadAssetsZXFullGame() {
diff --git a/engines/freescape/games/eclipse/eclipse.cpp b/engines/freescape/games/eclipse/eclipse.cpp
index 77662ecdfbc..189d96c41de 100644
--- a/engines/freescape/games/eclipse/eclipse.cpp
+++ b/engines/freescape/games/eclipse/eclipse.cpp
@@ -342,11 +342,8 @@ void EclipseEngine::borderScreen() {
 				drawFullscreenMessageAndWait(_messagesList[23]);
 			} else if (_variant & GF_ZX_DEMO_CRASH) {
 				drawFullscreenMessageAndWait(_messagesList[9]);
-				playSound(3, true);
 				drawFullscreenMessageAndWait(_messagesList[10]);
-				playSound(3, true);
 				drawFullscreenMessageAndWait(_messagesList[11]);
-				playSound(3, true);
 			}
 		} else {
 			FreescapeEngine::borderScreen();
@@ -410,7 +407,7 @@ void EclipseEngine::drawInfoMenu() {
 					saveGameDialog();
 					_gfx->setViewport(_viewArea);
 				} else if (isDOS() && event.customType == kActionToggleSound) {
-					playSound(6, true);
+					playSound(_soundIndexMenu, true);
 				} else if ((isDOS() || isCPC() || isSpectrum()) && event.customType == kActionEscape) {
 					_forceEndGame = true;
 					cont = false;


Commit: db6a6476f2fa36871547442f047b9f35cb1991b3
    https://github.com/scummvm/scummvm/commit/db6a6476f2fa36871547442f047b9f35cb1991b3
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-08-14T10:42:22+02:00

Commit Message:
HYPNO: fixed crash when loading the fonts for some hypno games

Changed paths:
    engines/hypno/hypno.h


diff --git a/engines/hypno/hypno.h b/engines/hypno/hypno.h
index 120f896b7ae..b587b45fb8e 100644
--- a/engines/hypno/hypno.h
+++ b/engines/hypno/hypno.h
@@ -538,8 +538,6 @@ private:
 	Common::Rect _h2Area;
 	Common::Rect _h3Area;
 
-	Common::BitArray _font05;
-	Common::BitArray _font08;
 	const Graphics::Font *_font;
 };
 
@@ -653,9 +651,6 @@ public:
 	Common::Array<Filename> _deathVideo;
 	Common::HashMap<Common::String, bool> _shootsDestroyed;
 
-	Common::BitArray _font05;
-	Common::BitArray _font08;
-
 	bool hasFeature(EngineFeature f) const override {
 		return (f == kSupportsReturnToLauncher);
 	}