[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.9,1.10

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv7700

Modified Files:
	sound.cpp 
Log Message:
Fix some odd regression issue.
Somewhere, recently, current_cd_sound has stopped being set for various things.



Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sound.cpp	15 Sep 2002 19:28:34 -0000	1.9
+++ sound.cpp	16 Sep 2002 12:10:19 -0000	1.10
@@ -335,10 +335,10 @@
 				int track = *ptr;
 	
 				if (track == _scumm->current_cd_sound)
-					result = pollCD();
-				if (result == 1) return;
-	
-					playCDTrack(track, 1, 0, 0);
+					if (pollCD() == 1) return;
+
+				playCDTrack(track, 1, 0, 0);
+				_scumm->current_cd_sound = track;
 				return;
 			}