[Scummvm-git-logs] scummvm master -> 95f964878ceaf27afcd8dacb916884adc037953f

[eriktorbjorn]

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:
51bdee615f SHERLOCK: Workaround for bad fog horn sound in Serrated Scalpel
95f964878c NEWS: Adjust note about sound workarounds in Serrated Scalpel


Commit: 51bdee615f061202688b61b8fe52181e02d1655c
    https://github.com/scummvm/scummvm/commit/51bdee615f061202688b61b8fe52181e02d1655c
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-12-15T08:43:46+01:00

Commit Message:
SHERLOCK: Workaround for bad fog horn sound in Serrated Scalpel

Turns out that the fog horn sound at Lord Brumwell's mansion has the
same problem as the doorbell one. The file says 1100 Hz, but the
original clearly didn't play it at that. 11000 Hz seems to match the 3DO
version, so let's go with that.

Changed paths:
    engines/sherlock/sound.cpp


diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index c212ddea38..374eb2f954 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -313,11 +313,12 @@ bool Sound::playSoundResource(const Common::String &name, const Common::String &
 
 		byte *decoded = (byte *)malloc((size - 1) * 2);
 
-		// WORKAROUND: The doorbell at Lord Brumwell's mansion sounds really
-		// strange at 1100 Hz. The game isn't heavy on sounds, but other sound
-		// effects seem to be mostly at 11000 Hz, and that sounds about right
-		// here since it matches the 3DO version.
-		if (name == "JFCHIME.SND" && rate == 1100) {
+		// WORKAROUND: The doorbell and fog horn at Lord Brumwell's mansion
+		// sounds really strange at 1100 Hz. The game isn't heavy on sounds,
+		// but other sound effects seem to be mostly at 11000 Hz, and that
+		// sounds about right here since it matches the 3DO version.
+
+		if ((name == "JFCHIME.SND" || name == "JFFOG.SND") && rate == 1100) {
 			rate = 11000;
 		}
 


Commit: 95f964878ceaf27afcd8dacb916884adc037953f
    https://github.com/scummvm/scummvm/commit/95f964878ceaf27afcd8dacb916884adc037953f
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-12-15T08:46:30+01:00

Commit Message:
NEWS: Adjust note about sound workarounds in Serrated Scalpel

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 616851ed2c..6a2c6a2b45 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -44,7 +44,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Fix crash using matches on lab table.
    - Fix character animation in Rose Tattoo.
    - Fix glitch opening map in Rose Tattoo.
-   - Fix bell pull sound in Serrated Scalpel.
+   - Fix bell pull and fog horn sounds in Serrated Scalpel.
    - Fix inventory not updating in Serrated Scalpel after examining watch.
    - Fix fog overlay at Cleopatra's Needle in Rose Tattoo.
    - Fix graphic issues in Serrated Scalpel looking at items whilst inventory is open.