[Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_sound.cpp,1.106.2.1,1.106.2.2

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Sat Mar 13 04:10:04 CET 2004


Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1061/driver

Modified Files:
      Tag: branch-0-6-0
	d_sound.cpp 
Log Message:
Fix a logical error in the music fading code. It should check if a stream
is fading, not the direction. (Also cleaned it up slightly.)


Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.106.2.1
retrieving revision 1.106.2.2
diff -u -d -r1.106.2.1 -r1.106.2.2
--- d_sound.cpp	15 Feb 2004 14:16:34 -0000	1.106.2.1
+++ d_sound.cpp	13 Mar 2004 12:01:09 -0000	1.106.2.2
@@ -469,14 +469,14 @@
 	// If both music streams are playing, one of them will have to go.
 
 	if (_music[0]._streaming && _music[1]._streaming) {
-		if (_music[0]._fading == 0 && _music[1]._fading == 0) {
+		if (!_music[0]._fading && !_music[1]._fading) {
 			// None of them are fading. This shouldn't happen, so
 			// just pick one and be done with it.
 			primaryStream = 0;
-		} else if (_music[0]._fading != 0 && _music[1]._fading == 0) {
+		} else if (_music[0]._fading && !_music[1]._fading) {
 			// Stream 0 is fading, so pick that one.
 			primaryStream = 0;
-		} else if (_music[0]._fading == 0 && _music[1]._fading > 0) {
+		} else if (!_music[0]._fading && _music[1]._fading) {
 			// Stream 1 is fading, so pick that one.
 			primaryStream = 1;
 		} else {





More information about the Scummvm-git-logs mailing list