[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.cpp,1.59,1.60

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv15585

Modified Files:
	d_sound.cpp 
Log Message:
Reverted part of the previous change. Control panel music should work again
but the credits music is still broken. I'll have to take a closer look at
this later.


Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- d_sound.cpp	25 Sep 2003 10:02:52 -0000	1.59
+++ d_sound.cpp	25 Sep 2003 11:35:54 -0000	1.60
@@ -943,8 +943,11 @@
 	// Calculate the file position of the end of the music
 	music[primaryStream]._fileEnd += music[primaryStream]._filePos;
 
-	music[primaryStream]._lastSample = fpMus.readUint16LE();
-	music[primaryStream]._filePos += 2;
+	// We used to read two bytes for _lastSample, but doing that breaks
+	// some of the music, so I guess that was a bug. Maybe.
+
+	music[primaryStream]._lastSample = fpMus.readByte();
+	music[primaryStream]._filePos++;
 	music[primaryStream]._streaming = true;
 
 	return RD_OK;