aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/imuse/imuse.cpp
diff options
context:
space:
mode:
authorJamieson Christian2006-03-04 19:35:38 +0000
committerJamieson Christian2006-03-04 19:35:38 +0000
commit857abe4c8bc353c2510a5c0b3351af3e0af4ca44 (patch)
tree1ea03d1e71107c1d934fb708c27ca2b27c91ebb5 /engines/scumm/imuse/imuse.cpp
parent01af975df48e82938031ed78f95ee2c9719fa3a6 (diff)
downloadscummvm-rg350-857abe4c8bc353c2510a5c0b3351af3e0af4ca44.tar.gz
scummvm-rg350-857abe4c8bc353c2510a5c0b3351af3e0af4ca44.tar.bz2
scummvm-rg350-857abe4c8bc353c2510a5c0b3351af3e0af4ca44.zip
Removed the default ignoreFadeouts parameter value for ImuseInternal's getSoundStatus method. The disposition of this method is going to be changing soon, and I'm getting confused by the assumptions being made by many of the calls to it.
svn-id: r21080
Diffstat (limited to 'engines/scumm/imuse/imuse.cpp')
-rw-r--r--engines/scumm/imuse/imuse.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp
index ca56d72455..6ccea8e53b 100644
--- a/engines/scumm/imuse/imuse.cpp
+++ b/engines/scumm/imuse/imuse.cpp
@@ -233,7 +233,7 @@ bool IMuseInternal::startSound(int sound) {
int i;
ImTrigger *trigger = _snm_triggers;
for (i = ARRAYSIZE(_snm_triggers); i; --i, ++trigger) {
- if (trigger->sound && trigger->id && trigger->command[0] == 8 && trigger->command[1] == sound && getSoundStatus(trigger->sound))
+ if (trigger->sound && trigger->id && trigger->command[0] == 8 && trigger->command[1] == sound && getSoundStatus(trigger->sound,true))
return false;
}
@@ -766,7 +766,7 @@ int32 IMuseInternal::doCommand(int numargs, int a[]) {
}
return -1;
case 13:
- return getSoundStatus(a[1]);
+ return getSoundStatus(a[1], true);
case 14:
// Sam and Max: Parameter fade
player = findActivePlayer(a[1]);
@@ -1003,7 +1003,7 @@ int32 IMuseInternal::ImSetTrigger(int sound, int id, int a, int b, int c, int d,
// NOTE: We ONLY do this if the sound that will trigger the command is actually
// playing. Otherwise, there's a problem when exiting and re-entering the
// Bumpusville mansion. Ref Bug #780918.
- if (trig->command[0] == 8 && getSoundStatus(trig->command[1]) && getSoundStatus(sound))
+ if (trig->command[0] == 8 && getSoundStatus(trig->command[1],true) && getSoundStatus(sound,true))
stopSound(trig->command[1]);
return 0;
}