diff options
| author | Martin Kiewitz | 2009-12-27 12:38:19 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2009-12-27 12:38:19 +0000 |
| commit | f01a6c9adf5e4303b92aba82d15169a6d0c97095 (patch) | |
| tree | e5df946e51e905d8e9aeefbb72eba7783b79e652 | |
| parent | fb237cd7aedf094621db54249fc41282a90d57ca (diff) | |
| download | scummvm-rg350-f01a6c9adf5e4303b92aba82d15169a6d0c97095.tar.gz scummvm-rg350-f01a6c9adf5e4303b92aba82d15169a6d0c97095.tar.bz2 scummvm-rg350-f01a6c9adf5e4303b92aba82d15169a6d0c97095.zip | |
SCI/newmusic: moving commented assert
svn-id: r46632
| -rw-r--r-- | engines/sci/resource.cpp | 1 | ||||
| -rw-r--r-- | engines/sci/sfx/music.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index bdc8b3b52d..8799138ac9 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -1912,6 +1912,7 @@ SoundResource::SoundResource(uint32 resNumber, ResourceManager *resMan, SciVersi _tracks[trackNr].digitalSampleRate = READ_LE_UINT16(channel->data); _tracks[trackNr].digitalSampleSize = READ_LE_UINT16(channel->data + 2); assert(READ_LE_UINT16(channel->data + 4) == 0); // Possibly a compression flag + //assert(READ_LE_UINT16(channelData + 6) == size); channel->data += 8; // Skip over header channel->size -= 8; } diff --git a/engines/sci/sfx/music.cpp b/engines/sci/sfx/music.cpp index 4eff06bcec..0b10b810f8 100644 --- a/engines/sci/sfx/music.cpp +++ b/engines/sci/sfx/music.cpp @@ -311,7 +311,6 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) { // play digital sample if (track->digitalChannelNr != -1) { byte *channelData = track->channels[track->digitalChannelNr].data; - //assert(READ_LE_UINT16(channelData + 6) == size); if (pSnd->pStreamAud) delete pSnd->pStreamAud; pSnd->pStreamAud = Audio::makeLinearInputStream(channelData, track->digitalSampleSize, track->digitalSampleRate, |