[Scummvm-cvs-logs] SF.net SVN: scummvm: [21080] scummvm/trunk/engines/scumm/imuse

Jamieson630 at users.sourceforge.net Jamieson630 at users.sourceforge.net
Sat Mar 4 11:36:04 CET 2006


Revision: 21080
Author:   Jamieson630
Date:     2006-03-04 11:35:38 -0800 (Sat, 04 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=21080&view=rev

Log Message:
-----------
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.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse/imuse.cpp
    scummvm/trunk/engines/scumm/imuse/imuse_internal.h
Modified: scummvm/trunk/engines/scumm/imuse/imuse.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse/imuse.cpp	2006-03-04 18:38:27 UTC (rev 21079)
+++ scummvm/trunk/engines/scumm/imuse/imuse.cpp	2006-03-04 19:35:38 UTC (rev 21080)
@@ -233,7 +233,7 @@
 	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 @@
 			}
 			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 @@
 	// 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;
 }

Modified: scummvm/trunk/engines/scumm/imuse/imuse_internal.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse/imuse_internal.h	2006-03-04 18:38:27 UTC (rev 21079)
+++ scummvm/trunk/engines/scumm/imuse/imuse_internal.h	2006-03-04 19:35:38 UTC (rev 21080)
@@ -456,7 +456,7 @@
 	bool startSound(int sound);
 	int stopSound(int sound);
 	int stopAllSounds();
-	int getSoundStatus(int sound, bool ignoreFadeouts = true) const;
+	int getSoundStatus(int sound, bool ignoreFadeouts) const;
 	int getMusicTimer() const;
 	int32 doCommand (int a, int b, int c, int d, int e, int f, int g, int h);
 	int32 doCommand (int numargs, int args[]);







More information about the Scummvm-git-logs mailing list