[Scummvm-git-logs] scummvm master -> 8936e26dfcd07eb7c9959c442a15daf167825aa4

[mduggan]

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:
b4fcc999b1 DGDS: Don't change music if id is the same
8936e26dfc NEWS: Mention support for Willy Beamish


Commit: b4fcc999b1ebb7cb7bfb9b71690c15bf471bb035
    https://github.com/scummvm/scummvm/commit/b4fcc999b1ebb7cb7bfb9b71690c15bf471bb035
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2025-03-02T19:52:27+11:00

Commit Message:
DGDS: Don't change music if id is the same

Changed paths:
    engines/dgds/sound.cpp


diff --git a/engines/dgds/sound.cpp b/engines/dgds/sound.cpp
index 6c1e794947b..1c71224d1f9 100644
--- a/engines/dgds/sound.cpp
+++ b/engines/dgds/sound.cpp
@@ -640,15 +640,25 @@ void Sound::playPCSound(int num, const Common::Array<SoundData> &dataArray, Audi
 			playPCM(data._data, data._size);
 		} else {
 			int idOffset = soundType == Audio::Mixer::kSFXSoundType ? SND_RESOURCE_OFFSET : MUSIC_RESOURCE_OFFSET;
+			int soundId = num + idOffset;
 
 			// Only play one music at a time, don't play sfx if sfx muted.
-			if (soundType == Audio::Mixer::kMusicSoundType)
+			if (soundType == Audio::Mixer::kMusicSoundType) {
+				MusicEntry *currentMusic = _music->getSlot(soundId);
+				//
+				// Don't change music if we are already playing the same track.  This happens
+				// when walking through the house in Willy Beamish where all the rooms have
+				// the same music track.
+				//
+				if (currentMusic && currentMusic->status == kSoundPlaying)
+					return;
 				stopMusic();
-			else if (soundType == Audio::Mixer::kSFXSoundType && _isSfxMuted)
+			} else if (soundType == Audio::Mixer::kSFXSoundType && _isSfxMuted) {
 				return;
+			}
 
-			processInitSound(num + idOffset, data, soundType);
-			processPlaySound(num + idOffset, false, false, data);
+			processInitSound(soundId, data, soundType);
+			processPlaySound(soundId, false, false, data);
 
 			// Immediately pause new music if muted
 			if (_isMusicMuted && soundType == Audio::Mixer::kMusicSoundType)


Commit: 8936e26dfcd07eb7c9959c442a15daf167825aa4
    https://github.com/scummvm/scummvm/commit/8936e26dfcd07eb7c9959c442a15daf167825aa4
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2025-03-02T19:52:27+11:00

Commit Message:
NEWS: Mention support for Willy Beamish

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 634bd4c3a83..57a03a6ee85 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -6,6 +6,7 @@ For a more comprehensive changelog of the latest experimental code, see:
  New games:
    - Added support for Dark Seed.
    - Added support for God of Thunder.
+   - Added support for The Adventures of Willy Beamish.
 
  Hopkins:
    - Fix crash using elevator to go to other floors.