aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2011-10-12 12:48:18 +0300
committerFilippos Karapetis2011-10-12 12:49:39 +0300
commit01666659264ece2cd33b0ecc53dd5fc8c3d7de5c (patch)
tree56ae59bb58fdfb91356da3e2f615be6224d02c46
parent497c3e75b40ac7ffb81562f19dc68c901faeb693 (diff)
downloadscummvm-rg350-01666659264ece2cd33b0ecc53dd5fc8c3d7de5c.tar.gz
scummvm-rg350-01666659264ece2cd33b0ecc53dd5fc8c3d7de5c.tar.bz2
scummvm-rg350-01666659264ece2cd33b0ecc53dd5fc8c3d7de5c.zip
SCI: Fixed a long-standing bug in kDoSound(init)
The sound handle should not be set in kDoSound(init), but in kDoSound(play). This is verified against several SCI versions, plus game scripts check if a sound slot is playing primarily by checking its handle. Fixes the sound in Shivers and probably an assortment of other sound related bugs
-rw-r--r--engines/sci/sound/soundcmd.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index e7d294dc11..63919859ca 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -133,8 +133,6 @@ void SoundCommandParser::processInitSound(reg_t obj) {
writeSelectorValue(_segMan, obj, SELECTOR(state), kSoundInitialized);
else
writeSelector(_segMan, obj, SELECTOR(nodePtr), obj);
-
- writeSelector(_segMan, obj, SELECTOR(handle), obj);
}
}