From f01a6c9adf5e4303b92aba82d15169a6d0c97095 Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Sun, 27 Dec 2009 12:38:19 +0000 Subject: SCI/newmusic: moving commented assert svn-id: r46632 --- engines/sci/resource.cpp | 1 + engines/sci/sfx/music.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') 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, -- cgit v1.2.3