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

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv15666/driver

Modified Files:
	d_sound.cpp 
Log Message:
Sync the credits so that the text scroll and music will last for about the
same amount of time. I don't think the original did this, but it turned out
to be pretty easy.


Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- d_sound.cpp	11 Jan 2004 16:49:19 -0000	1.100
+++ d_sound.cpp	12 Jan 2004 08:01:25 -0000	1.101
@@ -349,17 +349,17 @@
 void Sound::restoreMusicState(void) {
 	Common::StackLock lock(_mutex);
 
-	int restoreStream;
-
-	if (!_music[2]._streaming)
-		return;
-
 	// Fade out any music that happens to be playing
 
 	for (int i = 0; i < MAXMUS; i++) {
 		if (_music[i]._streaming)
 			_music[i].fadeDown();
 	}
+
+	if (!_music[2]._streaming)
+		return;
+
+	int restoreStream;
 
 	if (!_music[0]._streaming)
 		restoreStream = 0;