[Scummvm-cvs-logs] scummvm master -> 4e20a93931685c5a5e37a869c6ef57ed9f78aa83
wjp
wjp at usecode.org
Sat Dec 13 14:10:54 CET 2014
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:
4e20a93931 SCI: Fix comment for workaround.
Commit: 4e20a93931685c5a5e37a869c6ef57ed9f78aa83
https://github.com/scummvm/scummvm/commit/4e20a93931685c5a5e37a869c6ef57ed9f78aa83
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2014-12-13T14:09:36+01:00
Commit Message:
SCI: Fix comment for workaround.
The previous explanation just wasn't true.
Changed paths:
engines/sci/engine/savegame.cpp
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 9decc4c..0b55425 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -640,9 +640,11 @@ void SoundCommandParser::reconstructPlayList() {
initSoundResource(*i);
if ((*i)->status == kSoundPlaying) {
- // Sync the sound object's selectors related to playing with the stored
- // ones in the playlist, as they may have been invalidated when loading.
- // Refer to bug #3104624.
+ // WORKAROUND: PQ3 (German?) scripts can set volume negative in the
+ // sound object directly without going through DoSound.
+ // Since we re-read this selector when re-playing the sound after loading,
+ // this will lead to unexpected behaviour. As a workaround we
+ // sync the sound object's selectors here. (See bug #5501)
writeSelectorValue(_segMan, (*i)->soundObj, SELECTOR(loop), (*i)->loop);
writeSelectorValue(_segMan, (*i)->soundObj, SELECTOR(priority), (*i)->priority);
if (_soundVersion >= SCI_VERSION_1_EARLY)
More information about the Scummvm-git-logs
mailing list