[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.59,1.60

[Robert G?ffringmann]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv24727/sound

Modified Files:
	mixer.cpp 
Log Message:
make SoundMixer::playRaw only check sound IDs if you actually pass one

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- mixer.cpp	4 Jul 2003 14:49:51 -0000	1.59
+++ mixer.cpp	4 Jul 2003 20:08:02 -0000	1.60
@@ -230,13 +230,15 @@
 
 int SoundMixer::playRaw(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate, byte flags, int id) {
 	// Prevent duplicate sounds
-	_syst->lock_mutex(_mutex);	
-        for (int i = 0; i != NUM_CHANNELS; i++)
-                if (_channels[i] != NULL && _channels[i]->_id == id) {
-			_syst->unlock_mutex(_mutex);
-			return -1;
-		}
-	_syst->unlock_mutex(_mutex);
+	if (id != -1) {
+		_syst->lock_mutex(_mutex);	
+		    for (int i = 0; i != NUM_CHANNELS; i++)
+			        if (_channels[i] != NULL && _channels[i]->_id == id) {
+						_syst->unlock_mutex(_mutex);
+						return -1;
+					}
+		_syst->unlock_mutex(_mutex);
+	}
 
 	return insertChannel(handle, new ChannelRaw(this, sound, size, rate, flags, id));
 }