aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2009-12-23 20:13:54 +0000
committerFilippos Karapetis2009-12-23 20:13:54 +0000
commit51766d83ede7f2e22a4eebcc12c507a798cdfa92 (patch)
tree277a05103752826cea43b747065c8234dfa0929b
parentcaf1ab2a00ba2f58be29e89d780b69af2587119f (diff)
downloadscummvm-rg350-51766d83ede7f2e22a4eebcc12c507a798cdfa92.tar.gz
scummvm-rg350-51766d83ede7f2e22a4eebcc12c507a798cdfa92.tar.bz2
scummvm-rg350-51766d83ede7f2e22a4eebcc12c507a798cdfa92.zip
SCI/new music code: Song handles are now unique (as SCI0 relies on them, rather than on nodePtr)
svn-id: r46512
-rw-r--r--engines/sci/sfx/soundcmd.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/sfx/soundcmd.cpp b/engines/sci/sfx/soundcmd.cpp
index 55d7aa7323..6311216f4d 100644
--- a/engines/sci/sfx/soundcmd.cpp
+++ b/engines/sci/sfx/soundcmd.cpp
@@ -398,7 +398,6 @@ void SoundCommandParser::cmdPlayHandle(reg_t obj, int16 value) {
cmdInitHandle(obj, value);
}
- PUT_SEL32V(_segMan, obj, handle, 0x1234);
if (_hasNodePtr) {
PUT_SEL32V(_segMan, obj, min, 0);
PUT_SEL32V(_segMan, obj, sec, 0);
@@ -407,6 +406,7 @@ void SoundCommandParser::cmdPlayHandle(reg_t obj, int16 value) {
} else {
PUT_SEL32V(_segMan, obj, state, kSndStatusPlaying);
}
+
_music->_playList[slot]->loop = GET_SEL32V(_segMan, obj, loop) == 0xFFFF ? 1 : 0;
_music->_playList[slot]->prio = GET_SEL32V(_segMan, obj, priority);
_music->_playList[slot]->volume = GET_SEL32V(_segMan, obj, vol);