[Scummvm-git-logs] scummvm master -> 99a7478cd60ad4f0167dc4a8d0ac6498ca012d8b

sluicebox 22204938+sluicebox at users.noreply.github.com
Mon Aug 12 12:30:36 CEST 2019


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

Summary:
99a7478cd6 SCI: Update Sound:vol in processUpdateCues


Commit: 99a7478cd60ad4f0167dc4a8d0ac6498ca012d8b
    https://github.com/scummvm/scummvm/commit/99a7478cd60ad4f0167dc4a8d0ac6498ca012d8b
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2019-08-12T03:30:31-07:00

Commit Message:
SCI: Update Sound:vol in processUpdateCues

Sound:vol is updated when updating cues starting in SCI_VERSION_1_MIDDLE.

Fixes bug #10244. SQ4 localized floppy versions depend on this when getting
in the orange ship, they fade music and wait for the volume to reach zero.

Confirmed against asm that this is not in SQ4 floppy (early) but is in
LSL1VGA (middle) and SQ4 localized floppies and SQ4CD (late).

Changed paths:
    engines/sci/sound/soundcmd.cpp


diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 8c15a54..5279de8 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -616,6 +616,10 @@ void SoundCommandParser::processUpdateCues(reg_t obj) {
 		writeSelectorValue(_segMan, obj, SELECTOR(min), musicSlot->ticker / 3600);
 		writeSelectorValue(_segMan, obj, SELECTOR(sec), musicSlot->ticker % 3600 / 60);
 		writeSelectorValue(_segMan, obj, SELECTOR(frame), musicSlot->ticker % 60 / 2);
+
+		if (_soundVersion >= SCI_VERSION_1_MIDDLE) {
+			writeSelectorValue(_segMan, obj, SELECTOR(vol), musicSlot->volume);
+		}
 	}
 }
 





More information about the Scummvm-git-logs mailing list