[Scummvm-git-logs] scummvm master -> 920a342cdb3e48118cd32a20afe4cf050f140e9f

[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:
760964d596 FREESCAPE: Create a new SFXhandle for jetpack and use it
920a342cdb FREESCAPE: Stop the jetpack sound if energy reaches 0


Commit: 760964d596d083e8c0de1b5f5281c8d71d154008
    https://github.com/scummvm/scummvm/commit/760964d596d083e8c0de1b5f5281c8d71d154008
Author: akramhany (akramhany65 at gmail.com)
Date: 2025-03-15T19:49:08+01:00

Commit Message:
FREESCAPE: Create a new SFXhandle for jetpack and use it

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


diff --git a/engines/freescape/games/dark/dark.cpp b/engines/freescape/games/dark/dark.cpp
index 29c8333dcc5..3a063968881 100644
--- a/engines/freescape/games/dark/dark.cpp
+++ b/engines/freescape/games/dark/dark.cpp
@@ -666,7 +666,7 @@ void DarkEngine::pressedKey(const int keycode) {
 		} else if (_flyMode) {
 			float hzFreq = 1193180.0f / 0xd537;
 			_speaker->play(Audio::PCSpeaker::kWaveFormSquare, hzFreq, -1);
-			_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundFxHandle, _speaker, -1, Audio::Mixer::kMaxChannelVolume / 2, 0, DisposeAfterUse::NO);
+			_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundFxHandleJetpack, _speaker, -1, Audio::Mixer::kMaxChannelVolume / 2, 0, DisposeAfterUse::NO);
 			insertTemporaryMessage(_messagesList[11], _countdown - 2);
 		} else {
 			_speaker->stop();
diff --git a/engines/freescape/games/dark/dark.h b/engines/freescape/games/dark/dark.h
index e2eaef2e173..27b5788d896 100644
--- a/engines/freescape/games/dark/dark.h
+++ b/engines/freescape/games/dark/dark.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include "audio/mixer.h"
+
 namespace Freescape {
 
 enum {
@@ -100,6 +102,7 @@ public:
 	Font _fontSmall;
 	int _soundIndexRestoreECD;
 	int _soundIndexDestroyECD;
+	Audio::SoundHandle _soundFxHandleJetpack;
 
 	void drawString(const DarkFontSize size, const Common::String &str, int x, int y, uint32 primaryColor, uint32 secondaryColor, uint32 backColor, Graphics::Surface *surface);
 	void drawInfoMenu() override;


Commit: 920a342cdb3e48118cd32a20afe4cf050f140e9f
    https://github.com/scummvm/scummvm/commit/920a342cdb3e48118cd32a20afe4cf050f140e9f
Author: akramhany (akramhany65 at gmail.com)
Date: 2025-03-15T19:49:08+01:00

Commit Message:
FREESCAPE: Stop the jetpack sound if energy reaches 0

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


diff --git a/engines/freescape/games/dark/dark.cpp b/engines/freescape/games/dark/dark.cpp
index 3a063968881..096b43a3e98 100644
--- a/engines/freescape/games/dark/dark.cpp
+++ b/engines/freescape/games/dark/dark.cpp
@@ -691,6 +691,7 @@ void DarkEngine::updateTimeVariables() {
 				_gameStateVars[k8bitVariableEnergy]--;
 
 		if (_flyMode && _gameStateVars[k8bitVariableEnergy] == 0) {
+			_mixer->stopHandle(_soundFxHandleJetpack);
 			_flyMode = false;
 			insertTemporaryMessage(_messagesList[13], _countdown - 2);
 		}