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.

svn-id: r10407
This commit is contained in:
Torbjörn Andersson 2003-09-25 11:35:54 +00:00
parent b9cc1725b7
commit a4b32b67e8

View File

@ -943,8 +943,11 @@ int32 Sword2Sound::StreamCompMusicFromLock(const char *filename, uint32 musicId,
// 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;