diff options
| author | Torbjörn Andersson | 2003-09-25 11:35:54 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-09-25 11:35:54 +0000 |
| commit | a4b32b67e8dc9f9e74e99573459f6fbbf47a9d5a (patch) | |
| tree | dc6a2ff6b233e68705afe99b3cbdc1883cee4fe5 | |
| parent | b9cc1725b7b11fef693b3b3d0bf653a431b3b625 (diff) | |
| download | scummvm-rg350-a4b32b67e8dc9f9e74e99573459f6fbbf47a9d5a.tar.gz scummvm-rg350-a4b32b67e8dc9f9e74e99573459f6fbbf47a9d5a.tar.bz2 scummvm-rg350-a4b32b67e8dc9f9e74e99573459f6fbbf47a9d5a.zip | |
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
| -rw-r--r-- | sword2/driver/d_sound.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index 51bf4188e7..307393dc66 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -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; |