diff options
| author | Max Horn | 2004-04-10 00:51:12 +0000 |
|---|---|---|
| committer | Max Horn | 2004-04-10 00:51:12 +0000 |
| commit | d78e9bb0acbdc06431bf8b3e6f51bdf71c1e12df (patch) | |
| tree | 5bb47bf9b1806e5bba0841c33e04d4405b11a51f /scumm | |
| parent | a78fb367989db4c6416070a1f35446b3b63a5db8 (diff) | |
| download | scummvm-rg350-d78e9bb0acbdc06431bf8b3e6f51bdf71c1e12df.tar.gz scummvm-rg350-d78e9bb0acbdc06431bf8b3e6f51bdf71c1e12df.tar.bz2 scummvm-rg350-d78e9bb0acbdc06431bf8b3e6f51bdf71c1e12df.zip | |
cleanup
svn-id: r13529
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/sound.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 2bebefe3f0..088f446a45 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -852,19 +852,24 @@ void Sound::startSfxSound(File *file, int file_size, PlayingSoundHandle *handle, AudioStream *input = NULL; + printf("startSfxSound: file_size = %d\n", file_size); + switch (_soundMode) { case kMP3Mode: #ifdef USE_MAD + assert(file_size > 0); input = makeMP3Stream(file, file_size); #endif break; case kVorbisMode: #ifdef USE_VORBIS + assert(file_size > 0); input = makeVorbisStream(file, file_size); #endif break; case kFlacMode: #ifdef USE_FLAC + assert(file_size > 0); input = makeFlacStream(file, file_size); #endif break; @@ -956,10 +961,10 @@ File *Sound::openSfxFile() { size = compressed_offset; cur = _offsetTable; while (size > 0) { - cur[0].org_offset = file->readUint32BE(); - cur[0].new_offset = file->readUint32BE() + compressed_offset + 4; /* The + 4 is to take into accound the 'size' field */ - cur[0].num_tags = file->readUint32BE(); - cur[0].compressed_size = file->readUint32BE(); + cur->org_offset = file->readUint32BE(); + cur->new_offset = file->readUint32BE() + compressed_offset + 4; /* The + 4 is to take into accound the 'size' field */ + cur->num_tags = file->readUint32BE(); + cur->compressed_size = file->readUint32BE(); size -= 4 * 4; cur++; } |