libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-29 23:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

return null if sound is not found

Browse Source 
svn-id: r16737
This commit is contained in:
Paweł Kołodziejski 2005-02-06 10:09:37 +00:00
parent d261e3c9d3
commit ac72fcd63d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scumm/imuse_digi/dimuse_bndmgr.cpp
View File

@ -140,10 +140,11 @@ File *BundleMgr::getFile(const char *filename, int32 &offset, int32 &size) {
_file.seek(_bundleTable[i].offset, SEEK_SET);
offset = _bundleTable[i].offset;
size = _bundleTable[i].size;
break;
return &_file;
}
}
return &_file;
return NULL;
}
bool BundleMgr::open(const char *filename, bool &compressed) {

4
scumm/imuse_digi/dimuse_sndmgr.cpp
View File

@ -366,6 +366,10 @@ ImuseDigiSndMgr::soundStruct *ImuseDigiSndMgr::openSound(int32 soundId, const ch
int32 offset = 0, size = 0;
sprintf(fileName, "%s.map", soundName);
File *rmapFile = sound->bundle->getFile(fileName, offset, size);
if (!rmapFile) {
closeSound(sound);
return NULL;
}
prepareSoundFromRMAP(rmapFile, sound, offset, size);
strcpy(sound->name, soundName);
sound->soundId = soundId;