thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*** empty log message ***

Browse source 
svn-id: r14861
This commit is contained in:
Travis Howell 2004-09-02 07:00:57 +00:00
parent 0c5db81d0d
commit c4467d8e43
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
scumm/sound.cpp
View file

@ -163,9 +163,9 @@ void Sound::playSound(int soundID, int offset) {
bool music = false; bool music = false;
if (_vm->_heversion >= 70 && soundID > _vm->_numSounds) { if (_vm->_heversion >= 70 && soundID > _vm->_numSounds) {
debugC(DEBUG_SOUND, "playSound #%d", soundID); debug(0, "playSound #%d", soundID);
int music_offs, total_size; int music_offs, tunes, total_size;
uint skip = 0; uint skip = 0;
char buf[32]; char buf[32];
File musicFile; File musicFile;
@ -177,32 +177,31 @@ void Sound::playSound(int soundID, int offset) {
} }
musicFile.seek(4, SEEK_SET); musicFile.seek(4, SEEK_SET);
total_size = musicFile.readUint32BE(); total_size = musicFile.readUint32BE();
musicFile.seek(+8, SEEK_CUR);
tunes = musicFile.readUint32LE() - 1;
musicFile.seek(+40, SEEK_CUR); musicFile.seek(+28, SEEK_CUR);
if (musicFile.readUint32LE() == MKID('SGEN')) { if (musicFile.readUint32LE() == MKID('SGEN')) {
// TODO Work out skip calcution // Skip to correct music header
//skip = (soundID - 8001) * 21; if (tunes)
musicFile.seek(+skip, SEEK_CUR); skip = (soundID - 8000) * 21;
// Skip to offsets // Skip to offsets
musicFile.seek(+8, SEEK_CUR); musicFile.seek(+8, SEEK_CUR);
} else { } else {
// Rewind // Rewind
musicFile.seek(-44, SEEK_CUR); musicFile.seek(-28, SEEK_CUR);
// Skip SGHD header (16)
musicFile.seek(+16, SEEK_CUR);
// Skip to correct music header // Skip to correct music header
if (soundID >= 8000) if (tunes) {
skip = (soundID - 8001) * 25; if (soundID >= 8000)
else skip = (soundID - 8000) * 25;
skip = (soundID - 4001) * 25; else
musicFile.seek(+skip, SEEK_CUR); skip = (soundID - 4001) * 25;
}
} }
musicFile.seek(+skip, SEEK_CUR);
music_offs = musicFile.readUint32LE(); music_offs = musicFile.readUint32LE();
size = musicFile.readUint32LE(); size = musicFile.readUint32LE();