libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-09 12:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix last commit to release, and add version 2 fallback for compressed files

Browse Source 
svn-id: r30499
This commit is contained in:
Paweł Kołodziejski 2008-01-15 20:09:56 +00:00
parent 173988960b
commit c3d4abe4b7
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
engines/scumm/imuse_digi/dimuse_sndmgr.cpp
View File

@ -101,7 +101,10 @@ void ImuseDigiSndMgr::prepareSoundFromRMAP(Common::File *file, SoundDesc *sound,
assert(tag == MKID_BE('RMAP'));
int32 version = file->readUint32BE();
if (version != 3) {
error("ImuseDigiSndMgr::prepareSoundFromRMAP: Wrong version number, expected 3, but it's: %d.", version);
if (version == 2)
warning("ImuseDigiSndMgr::prepareSoundFromRMAP: Wrong version number, expected 3, but it's 2. Recompress data with latest tool.");
else
error("ImuseDigiSndMgr::prepareSoundFromRMAP: Wrong version number, expected 3, but it's: %d.", version);
}
sound->bits = file->readUint32BE();
sound->freq = file->readUint32BE();
@ -109,7 +112,11 @@ void ImuseDigiSndMgr::prepareSoundFromRMAP(Common::File *file, SoundDesc *sound,
sound->numRegions = file->readUint32BE();
sound->numJumps = file->readUint32BE();
sound->numSyncs = file->readUint32BE();
sound->numMarkers = file->readUint32BE();
if (version >= 3)
sound->numMarkers = file->readUint32BE();
else
sound->numMarkers = 0;
sound->region = new Region[sound->numRegions];
assert(sound->region);
sound->jump = new Jump[sound->numJumps];
@ -134,11 +141,13 @@ void ImuseDigiSndMgr::prepareSoundFromRMAP(Common::File *file, SoundDesc *sound,
sound->sync[l].ptr = (byte *)malloc(sound->sync[l].size);
file->read(sound->sync[l].ptr, sound->sync[l].size);
}
for (l = 0; l < sound->numMarkers; l++) {
sound->marker[l].pos = file->readUint32BE();
sound->marker[l].length = file->readUint32BE();
sound->marker[l].ptr = new char[sound->marker[l].length];
file->read(sound->marker[l].ptr, sound->marker[l].length);
if (version >= 3) {
for (l = 0; l < sound->numMarkers; l++) {
sound->marker[l].pos = file->readUint32BE();
sound->marker[l].length = file->readUint32BE();
sound->marker[l].ptr = new char[sound->marker[l].length];
file->read(sound->marker[l].ptr, sound->marker[l].length);
}
}
}
@ -475,10 +484,11 @@ void ImuseDigiSndMgr::closeSound(SoundDesc *soundDesc) {
for (int r = 0; r < soundDesc->numSyncs; r++)
free(soundDesc->sync[r].ptr);
for (int r = 0; r < soundDesc->numSyncs; r++)
delete[] soundDesc->marker[r].ptr;
delete[] soundDesc->region;
delete[] soundDesc->jump;
delete[] soundDesc->sync;
delete[] soundDesc->marker->ptr;
delete[] soundDesc->marker;
memset(soundDesc, 0, sizeof(SoundDesc));
}